Skip to content
Snippets Groups Projects
Commit 94c39465 authored by Siddharth Agarwal's avatar Siddharth Agarwal
Browse files

merge: standardize error message for dirty working dir

parent 41abe2e3
No related branches found
No related tags found
No related merge requests found
......@@ -711,7 +711,7 @@
hint=_("use 'hg update' "
"or check 'hg heads'"))
if not force and (wc.files() or wc.deleted()):
raise util.Abort(_("outstanding uncommitted changes"),
raise util.Abort(_("uncommitted changes"),
hint=_("use 'hg status' to list changes"))
for s in sorted(wc.substate):
if wc.sub(s).dirty():
......
......@@ -19,7 +19,7 @@
Should fail, since there are deleted files:
$ hg merge
abort: outstanding uncommitted changes
abort: uncommitted changes
(use 'hg status' to list changes)
[255]
......
......@@ -140,7 +140,7 @@
$ echo This is file b22 > b
merge fails
$ hg merge 2
abort: outstanding uncommitted changes
abort: uncommitted changes
(use 'hg status' to list changes)
[255]
merge expected!
......@@ -177,7 +177,7 @@
$ echo This is file b33 > b
merge of b should fail
$ hg merge 2
abort: outstanding uncommitted changes
abort: uncommitted changes
(use 'hg status' to list changes)
[255]
merge of b expected
......
......@@ -171,7 +171,7 @@
(commit and merge, or update --clean to discard changes)
[255]
$ hg --debug merge
abort: outstanding uncommitted changes
abort: uncommitted changes
(use 'hg status' to list changes)
[255]
$ hg --debug merge -f
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment