diff options
| author | David Rodriguez <deivid.rodriguez@riseup.net> | 2023-09-25 09:51:33 +0200 |
|---|---|---|
| committer | git <svn-admin@ruby-lang.org> | 2023-09-27 05:20:57 +0000 |
| commit | a812f1fed0e6e184447ca00b713d54b25be05911 (patch) | |
| tree | 61b0a140a005fa7741158eaa41a7d057bbac3a11 /lib/bundler/lockfile_parser.rb | |
| parent | bc664609df6a5dfb95bc9c604bd0a661b3fbcf26 (diff) | |
[rubygems/rubygems] Reword a couple of error messages
When a path does not make a lot of sense.
https://github.com/rubygems/rubygems/commit/d173c79e9a
Diffstat (limited to 'lib/bundler/lockfile_parser.rb')
| -rw-r--r-- | lib/bundler/lockfile_parser.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/lockfile_parser.rb b/lib/bundler/lockfile_parser.rb index 9497108dce..146e728989 100644 --- a/lib/bundler/lockfile_parser.rb +++ b/lib/bundler/lockfile_parser.rb @@ -67,7 +67,7 @@ module Bundler @specs = {} if lockfile.match?(/<<<<<<<|=======|>>>>>>>|\|\|\|\|\|\|\|/) - raise LockfileError, "Your #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)} contains merge conflicts.\n" \ + raise LockfileError, "Your lockfile contains merge conflicts.\n" \ "Run `git checkout HEAD -- #{Bundler.default_lockfile.relative_path_from(SharedHelpers.pwd)}` first to get a clean lock." end |