Fix mistakes

3 files changed, 5 insertions, 5 deletions

diff --git a/lib/bundler/inline.rb b/lib/bundler/inline.rb
index 834b9b9cb3..1e690565c6 100644
--- a/lib/bundler/inline.rb
+++ b/lib/bundler/inline.rb
@@ -33,7 +33,7 @@ def gemfile(install = false, &gemfile)
   def Bundler.root
     Bundler::SharedHelpers.pwd.expand_path
   end
-  ENV['BUNDLE_GEMFILE'] ||= 'gems.rb'
+  ENV["BUNDLE_GEMFILE"] ||= "gems.rb"
 
   builder = Bundler::Dsl.new
   builder.instance_eval(&gemfile)
diff --git a/lib/bundler/lockfile_parser.rb b/lib/bundler/lockfile_parser.rb
index e112709182..799093345f 100644
--- a/lib/bundler/lockfile_parser.rb
+++ b/lib/bundler/lockfile_parser.rb
@@ -34,8 +34,8 @@ module Bundler
       @rubygems_aggregate = Source::Rubygems.new
 
       if lockfile.match(/<<<<<<<|=======|>>>>>>>|\|\|\|\|\|\|\|/)
-        raise LockfileError, "Your gems.locked contains merge conflicts.\n" \
-          "Run `git checkout HEAD -- gems.locked` first to get a clean lock."
+        raise LockfileError, "Your #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} contains merge conflicts.\n" \
+          "Run `git checkout HEAD -- #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}` first to get a clean lock."
       end
 
       lockfile.split(/(?:\r?\n)+/).each do |line|
diff --git a/lib/bundler/resolver.rb b/lib/bundler/resolver.rb
index ec4371e124..1f1b4cce98 100644
--- a/lib/bundler/resolver.rb
+++ b/lib/bundler/resolver.rb
@@ -273,11 +273,11 @@ module Bundler
     end
 
     def name_for_explicit_dependency_source
-      "gems.rb"
+      "#{Bundler.default_gemfile.basename}" rescue "gems.rb"
     end
 
     def name_for_locking_dependency_source
-      "gems.locked"
+      "#{Bundler.default_lockfile.basename}" rescue "gems.locked"
     end
 
     def requirement_satisfied_by?(requirement, activated, spec)