[PATCH] merge: output the complete options in the guidance text, not only the often used. Change it as well in the test case outputs.

rupert THURNER rupert.thurner at gmail.com
Sat Jun 26 06:33:24 CDT 2010


# HG changeset patch
# User Rupert THURNER <rupert.thurner at gmail.com>
# Date 1277550559 -7200
# Node ID 74e62efe1bc867702df88e0f5c8b9bf1c18ca207
# Parent  8b452fe4bf506a1a08bbc7e1bac81aceda8f4d10
merge: output the complete options in the guidance text, not only the
often used. Change it as well in the test case outputs.

diff -r 8b452fe4bf50 -r 74e62efe1bc8 i18n/da.po
--- a/i18n/da.po	Mon Jun 21 17:02:48 2010 -0300
+++ b/i18n/da.po	Sat Jun 26 13:09:19 2010 +0200
@@ -11591,7 +11591,7 @@
 "brug 'hg resolve' for at prøve at sammenføje uløste filer igen eller 'hg up -"
 "C' for at opgive\n"

-msgid "(branch merge, don't forget to commit)\n"
+msgid "(branch merge, either 'commit' or 'hg update -C')\n"
 msgstr "(grensammenføjning, glem ikke at deponere)\n"

 #, python-format
diff -r 8b452fe4bf50 -r 74e62efe1bc8 i18n/de.po
--- a/i18n/de.po	Mon Jun 21 17:02:48 2010 -0300
+++ b/i18n/de.po	Sat Jun 26 13:09:19 2010 +0200
@@ -19833,7 +19833,7 @@
 "Nutze 'hg resolve', um nicht aufgelöste Zusammenführungen zu
wiederholen oder\n"
 "'hg up --clean' um andere Änderungen aufzugeben\n"

-msgid "(branch merge, don't forget to commit)\n"
+msgid "(branch merge, either 'commit' or 'hg update -C')\n"
 msgstr "(Zweig-Zusammenführung, vergiss nicht 'hg commit' auszuführen)\n"

 #, python-format
diff -r 8b452fe4bf50 -r 74e62efe1bc8 i18n/el.po
--- a/i18n/el.po	Mon Jun 21 17:02:48 2010 -0300
+++ b/i18n/el.po	Sat Jun 26 13:09:19 2010 +0200
@@ -13748,7 +13748,7 @@
 msgid "use 'hg resolve' to retry unresolved file merges or 'hg update
-C' to abandon\n"
 msgstr ""

-msgid "(branch merge, don't forget to commit)\n"
+msgid "(branch merge, either 'commit' or 'hg update -C')\n"
 msgstr ""

 #, python-format
diff -r 8b452fe4bf50 -r 74e62efe1bc8 i18n/fr.po
--- a/i18n/fr.po	Mon Jun 21 17:02:48 2010 -0300
+++ b/i18n/fr.po	Sat Jun 26 13:09:19 2010 +0200
@@ -10424,7 +10424,7 @@
 msgid "use 'hg resolve' to retry unresolved file merges or 'hg update
-C' to abandon\n"
 msgstr ""

-msgid "(branch merge, don't forget to commit)\n"
+msgid "(branch merge, either 'commit' or 'hg update -C')\n"
 msgstr ""

 #, python-format
diff -r 8b452fe4bf50 -r 74e62efe1bc8 i18n/it.po
--- a/i18n/it.po	Mon Jun 21 17:02:48 2010 -0300
+++ b/i18n/it.po	Sat Jun 26 13:09:19 2010 +0200
@@ -8992,7 +8992,7 @@
 "usa 'hg resolve' per riprovare i merge sui file non risolti o\n"
 "'hg up --clean' per abbandonare\n"

-msgid "(branch merge, don't forget to commit)\n"
+msgid "(branch merge, either 'commit' or 'hg update -C')\n"
 msgstr "(merge su branch, non dimenticare di effettuare il commit)\n"

 #, python-format
diff -r 8b452fe4bf50 -r 74e62efe1bc8 i18n/ja.po
--- a/i18n/ja.po	Mon Jun 21 17:02:48 2010 -0300
+++ b/i18n/ja.po	Sat Jun 26 13:09:19 2010 +0200
@@ -10388,7 +10388,7 @@
 msgid "use 'hg resolve' to retry unresolved file merges or 'hg update
-C' to abandon\n"
 msgstr "'hg resolve' での再度衝突解消か、'hg up -C' で変更破棄してください\n"

-msgid "(branch merge, don't forget to commit)\n"
+msgid "(branch merge, either 'commit' or 'hg update -C')\n"
 msgstr "(マージ結果の commit を忘れずに)\n"

 #, python-format
diff -r 8b452fe4bf50 -r 74e62efe1bc8 i18n/pt_BR.po
--- a/i18n/pt_BR.po	Mon Jun 21 17:02:48 2010 -0300
+++ b/i18n/pt_BR.po	Sat Jun 26 13:09:19 2010 +0200
@@ -13378,7 +13378,7 @@
 msgid "use 'hg resolve' to retry unresolved file merges or 'hg update
-C' to abandon\n"
 msgstr "use 'hg resolve' para mesclar novamente arquivos não
resolvidos ou 'hg update -C' para abandonar\n"

-msgid "(branch merge, don't forget to commit)\n"
+msgid "(branch merge, either 'commit' or 'hg update -C')\n"
 msgstr "(mesclagem de ramo, não esqueça de consolidar)\n"

 #, python-format
diff -r 8b452fe4bf50 -r 74e62efe1bc8 i18n/sv.po
--- a/i18n/sv.po	Mon Jun 21 17:02:48 2010 -0300
+++ b/i18n/sv.po	Sat Jun 26 13:09:19 2010 +0200
@@ -10309,7 +10309,7 @@
 msgid "use 'hg resolve' to retry unresolved file merges or 'hg update
-C' to abandon\n"
 msgstr ""

-msgid "(branch merge, don't forget to commit)\n"
+msgid "(branch merge, either 'commit' or 'hg update -C')\n"
 msgstr ""

 #, python-format
diff -r 8b452fe4bf50 -r 74e62efe1bc8 i18n/zh_CN.po
--- a/i18n/zh_CN.po	Mon Jun 21 17:02:48 2010 -0300
+++ b/i18n/zh_CN.po	Sat Jun 26 13:09:19 2010 +0200
@@ -10178,7 +10178,7 @@
 msgid "use 'hg resolve' to retry unresolved file merges or 'hg up
--clean' to abandon\n"
 msgstr ""

-msgid "(branch merge, don't forget to commit)\n"
+msgid "(branch merge, either 'commit' or 'hg update -C')\n"
 msgstr ""

 #, python-format
diff -r 8b452fe4bf50 -r 74e62efe1bc8 i18n/zh_TW.po
--- a/i18n/zh_TW.po	Mon Jun 21 17:02:48 2010 -0300
+++ b/i18n/zh_TW.po	Sat Jun 26 13:09:19 2010 +0200
@@ -9834,7 +9834,7 @@
 msgid "use 'hg resolve' to retry unresolved file merges or 'hg update
-C' to abandon\n"
 msgstr ""

-msgid "(branch merge, don't forget to commit)\n"
+msgid "(branch merge, either 'commit' or 'hg update -C')\n"
 msgstr ""

 #, python-format
diff -r 8b452fe4bf50 -r 74e62efe1bc8 mercurial/hg.py
--- a/mercurial/hg.py	Mon Jun 21 17:02:48 2010 -0300
+++ b/mercurial/hg.py	Sat Jun 26 13:09:19 2010 +0200
@@ -402,7 +402,7 @@
         repo.ui.status(_("use 'hg resolve' to retry unresolved file merges "
                          "or 'hg update -C' to abandon\n"))
     elif remind:
-        repo.ui.status(_("(branch merge, don't forget to commit)\n"))
+        repo.ui.status(_("(branch merge, either 'commit' or 'hg
update -C')\n"))
     return stats[3] > 0

 def revert(repo, node, choose):
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-586.out
--- a/tests/test-586.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-586.out	Sat Jun 26 13:09:19 2010 +0200
@@ -9,7 +9,7 @@
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 C b
 % create test repos
 adding a
@@ -32,7 +32,7 @@
 (run 'hg heads' to see heads, 'hg merge' to merge)
 % merge both repos
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % move b content
 src/b
 tst/a
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-annotate.out
--- a/tests/test-annotate.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-annotate.out	Sat Jun 26 13:09:19 2010 +0200
@@ -56,7 +56,7 @@
 created new head
 merging b
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % annotate after merge
 0 a: a
 1 a: a
@@ -75,7 +75,7 @@
 created new head
 merging b
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % annotate after rename merge
 0 a: a
 6 b: z
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-backout.out
--- a/tests/test-backout.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-backout.out	Sat Jun 26 13:09:19 2010 +0200
@@ -31,7 +31,7 @@
 merging with changeset 3:26b8ccb9ad91
 merging a
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 line 1
 line 2
 line 3
@@ -52,7 +52,7 @@
 adding d
 created new head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 # backout of merge should fail
 abort: cannot backout a merge changeset without --parent
 # backout of merge with bad parent should fail
@@ -84,7 +84,7 @@
 C file2
 % on branch2 with branch1 merged, so file1 should be gone:
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 22149cdde76d (branch2) tip
 C default
 C file2
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-bheads.out
--- a/tests/test-bheads.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-bheads.out	Sat Jun 26 13:09:19 2010 +0200
@@ -45,7 +45,7 @@
 3: Adding b branch head 1 (b)
 =======
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 6: Merging b branch head 2 and b branch head 3 (b)
 3: Adding b branch head 1 (b)
 1: Adding a branch (a)
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-bisect2.out
--- a/tests/test-bisect2.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-bisect2.out	Sat Jun 26 13:09:19 2010 +0200
@@ -3,20 +3,20 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 created new head
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 3 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 % log
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-bundle-r.out
--- a/tests/test-bundle-r.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-bundle-r.out	Sat Jun 26 13:09:19 2010 +0200
@@ -232,7 +232,7 @@
  anotherfile
  adifferentfile
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 7 changesets found
 updating to branch default
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-bundle-vs-outgoing.out
--- a/tests/test-bundle-vs-outgoing.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-bundle-vs-outgoing.out	Sat Jun 26 13:09:19 2010 +0200
@@ -8,7 +8,7 @@
 rev 5
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 rev 7
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 rev 8
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-changelog-exec.out
--- a/tests/test-changelog-exec.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-changelog-exec.out	Sat Jun 26 13:09:19 2010 +0200
@@ -6,7 +6,7 @@
 % manifest of p1:
 foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % this should not mention bar:
 changeset:   3:ef2fc9b4a51b
 tag:         tip
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-commit.out
--- a/tests/test-commit.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-commit.out	Sat Jun 26 13:09:19 2010 +0200
@@ -97,7 +97,7 @@
 created new head
 merging a
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % should fail because we are specifying a file name
 abort: cannot partially commit a merge (do not specify files or patterns)
 % should fail because we are specifying a pattern
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-confused-revert.out
--- a/tests/test-confused-revert.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-confused-revert.out	Sat Jun 26 13:09:19 2010 +0200
@@ -11,7 +11,7 @@
 created new head
 merging a
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 %%% should show foo-b
 foo-b
 %%% should show a removed and b added
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-convert-clonebranches.out
--- a/tests/test-convert-clonebranches.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-convert-clonebranches.out	Sat Jun 26 13:09:19 2010 +0200
@@ -1,6 +1,6 @@
 marked working directory as branch branch0
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % convert
 3 adda
 2 changea
@@ -13,7 +13,7 @@
 marked working directory as branch branch1
 marked working directory as branch branch2
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 marked working directory as branch branch3
 % incremental conversion
 2 c1
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-convert-hg-source.out
--- a/tests/test-convert-hg-source.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-convert-hg-source.out	Sat Jun 26 13:09:19 2010 +0200
@@ -1,11 +1,11 @@
 created new head
 merging baz and foo to baz
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 merging foo and baz to baz
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 created new head
 initializing destination new repository
 scanning source...
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-convert-hg-startrev.out
--- a/tests/test-convert-hg-startrev.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-convert-hg-startrev.out	Sat Jun 26 13:09:19 2010 +0200
@@ -1,7 +1,7 @@
 1 files updated, 0 files merged, 2 files removed, 0 files unresolved
 merging a and e to e
 2 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % convert from null revision
 initializing destination empty repository
 scanning source...
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-copy-move-merge.out
--- a/tests/test-copy-move-merge.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-copy-move-merge.out	Sat Jun 26 13:09:19 2010 +0200
@@ -26,7 +26,7 @@
 my c at fb3948d97f07+ other c at 7f1309517659 ancestor a at 583c7b748052
  premerge successful
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 -- b --
 0
 1
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-double-merge.out
--- a/tests/test-double-merge.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-double-merge.out	Sat Jun 26 13:09:19 2010 +0200
@@ -28,7 +28,7 @@
 my foo at 2092631ce82b+ other foo at d9da848d0adf ancestor foo at 310fd17130da
  premerge successful
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 -- foo --
 line 0
 line 1
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-empty-file.out
--- a/tests/test-empty-file.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-empty-file.out	Sat Jun 26 13:09:19 2010 +0200
@@ -13,7 +13,7 @@
 summary:     add empty2

 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 M empty2
 b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty1
 b80de5d138758541c5f05265ad144ab9fa86d1db 644   empty2
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-empty-group.out
--- a/tests/test-empty-group.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-empty-group.out	Sat Jun 26 13:09:19 2010 +0200
@@ -6,10 +6,10 @@
 adding y
 created new head
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 created new head
 requesting all changes
 adding changesets
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-excessive-merge.out
--- a/tests/test-excessive-merge.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-excessive-merge.out	Sat Jun 26 13:09:19 2010 +0200
@@ -1,10 +1,10 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 created new head
 changeset:   4:f6c172c6198c
 tag:         tip
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-extdiff.out
--- a/tests/test-extdiff.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-extdiff.out	Sat Jun 26 13:09:19 2010 +0200
@@ -30,7 +30,7 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 diffing a.2a13a4d2da36/a [tmp]/test-extdiff/a/a
 diffing a.8a5febb7f867/a a.34eed99112ab/a
 diffing a.2a13a4d2da36/a a.46c0e4daeb72/a
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-fetch.out
--- a/tests/test-fetch.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-fetch.out	Sat Jun 26 13:09:19 2010 +0200
@@ -154,7 +154,7 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-filebranch.out
--- a/tests/test-filebranch.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-filebranch.out	Sat Jun 26 13:09:19 2010 +0200
@@ -17,7 +17,7 @@
 getting bar
 merging foo
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 we shouldn't have anything but foo in merge state here
 m 644          3 foo
 main: we should have a merge here
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-flags.out
--- a/tests/test-flags.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-flags.out	Sat Jun 26 13:09:19 2010 +0200
@@ -48,7 +48,7 @@

 resolving manifests
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 pulling from ../test2
 searching for changes
 adding changesets
@@ -87,7 +87,7 @@

 resolving manifests
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 -rwxr-x---
 -rwxr-x---
 -rwxr-x---
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-globalopts.out
--- a/tests/test-globalopts.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-globalopts.out	Sat Jun 26 13:09:19 2010 +0200
@@ -11,7 +11,7 @@
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 %% -R/--repository
 changeset:   0:8580ff50825a
 tag:         tip
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-hook.out
--- a/tests/test-hook.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-hook.out	Sat Jun 26 13:09:19 2010 +0200
@@ -18,7 +18,7 @@
 commit.b hook: HG_NODE=1324a5531bac09b329c3845d35ae6a7526874edb
HG_PARENT1=29b62aeb769fdf78d8d9c5f28b017f76d7ef824b
 created new head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 precommit hook: HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb
HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2
 pretxncommit hook: HG_NODE=4c52fb2e402287dd5dc052090682536c8406c321
HG_PARENT1=1324a5531bac09b329c3845d35ae6a7526874edb
HG_PARENT2=b702efe9688826e3a91283852b328b84dbf37bc2
HG_PENDING=$HGTMP/test-hook/a
 3:4c52fb2e4022
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-issue522.out
--- a/tests/test-issue522.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-issue522.out	Sat Jun 26 13:09:19 2010 +0200
@@ -11,7 +11,7 @@
 update: foo 1/1 files (100.00%)
 getting foo
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 n   0         -2 unset               foo
 M foo
 c6fc755d7e68f49f880599da29f15add41f42f5a 644   foo
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-issue612.out
--- a/tests/test-issue612.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-issue612.out	Sat Jun 26 13:09:19 2010 +0200
@@ -5,7 +5,7 @@
 ? src/a.o
 merging src/a.c and source/a.c to source/a.c
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 M source/a.c
 R src/a.c
 ? source/a.o
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-issue619.out
--- a/tests/test-issue619.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-issue619.out	Sat Jun 26 13:09:19 2010 +0200
@@ -4,7 +4,7 @@
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 fast-forward
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 bogus fast-forward should fail
 abort: merging with a working directory ancestor has no effect
 done
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-issue672.out
--- a/tests/test-issue672.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-issue672.out	Sat Jun 26 13:09:19 2010 +0200
@@ -18,7 +18,7 @@
 update: 1a 2/2 files (100.00%)
 getting 1a
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
@@ -39,7 +39,7 @@
 my 1a at e327dca35ac8+ other 1 at 746e9549ea96 ancestor 1 at 81f4b099af3d
  premerge successful
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   searching for copies back to rev 1
   unmatched files in other:
@@ -59,4 +59,4 @@
 my 1a at 746e9549ea96+ other 1a at e327dca35ac8 ancestor 1 at 81f4b099af3d
  premerge successful
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-keyword.out
--- a/tests/test-keyword.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-keyword.out	Sat Jun 26 13:09:19 2010 +0200
@@ -456,7 +456,7 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 $Id: m 27d48ee14f67 Thu, 01 Jan 1970 00:00:00 +0000 test $
 foo
 % conflict
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-log.out
--- a/tests/test-log.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-log.out	Sat Jun 26 13:09:19 2010 +0200
@@ -181,7 +181,7 @@

 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % log -r . with two parents
 changeset:   3:e62f78d544b4
 parent:      1:3d5bf5654eda
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-manifest-merging.out
--- a/tests/test-manifest-merging.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-manifest-merging.out	Sat Jun 26 13:09:19 2010 +0200
@@ -10,6 +10,6 @@
 adding gamma
 % pull into work and merge
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % revert to changeset 1 to simulate a failed merge
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-merge-closedheads.out
--- a/tests/test-merge-closedheads.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-merge-closedheads.out	Sat Jun 26 13:09:19 2010 +0200
@@ -15,4 +15,4 @@
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-merge-commit.out
--- a/tests/test-merge-commit.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-merge-commit.out	Sat Jun 26 13:09:19 2010 +0200
@@ -2,7 +2,7 @@
 created new head
 merging bar and foo to bar
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % contents of bar should be line0 line1 line2
 line0
 line1
@@ -34,7 +34,7 @@
 my bar at 2263c1be0967+ other bar at 0555950ead28 ancestor bar at 0f2ff26688b9
  premerge successful
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % contents of bar should be line1 line2
 line1
 line2
@@ -53,7 +53,7 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 merging foo and bar to bar
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % contents of bar should be line0 line1 line2
 line0
 line1
@@ -85,7 +85,7 @@
 my bar at 2263c1be0967+ other bar at 3ffa6b9e35f0 ancestor bar at 0f2ff26688b9
  premerge successful
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % contents of bar should be line1 line2
 line1
 line2
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-merge-default.out
--- a/tests/test-merge-default.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-merge-default.out	Sat Jun 26 13:09:19 2010 +0200
@@ -13,7 +13,7 @@
 (run 'hg heads .' to see heads)
 % should succeed
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % should succeed - 2 heads
 changeset:   3:ea9ff125ff88
 parent:      1:1846eede8b68
@@ -22,7 +22,7 @@
 summary:     d

 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % should fail because at tip
 abort: there is nothing to merge
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-merge-force.out
--- a/tests/test-merge-force.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-merge-force.out	Sat Jun 26 13:09:19 2010 +0200
@@ -4,7 +4,7 @@
 resolving manifests
 removing a
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % should show a as removed
 R a
 % manifest. should not have a:
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-merge-internal-tools-pattern.out
--- a/tests/test-merge-internal-tools-pattern.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-merge-internal-tools-pattern.out	Sat Jun 26 13:09:19 2010 +0200
@@ -17,7 +17,7 @@
 # merge using internal:local tool
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 line 1
 line 2
 third line
@@ -25,7 +25,7 @@
 # merge using internal:other tool
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 first line
 line 2
 line 3
@@ -34,7 +34,7 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 first line
 line 2
 third line
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-merge-prompt.out
--- a/tests/test-merge-prompt.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-merge-prompt.out	Sat Jun 26 13:09:19 2010 +0200
@@ -9,7 +9,7 @@
 remote changed file2 which local deleted
 use (c)hanged version or leave (d)eleted? c
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 status:
 M file2
 C file1
@@ -25,7 +25,7 @@
  local changed file1 which remote deleted
 use (c)hanged version or (d)elete? remote changed file2 which local deleted
 use (c)hanged version or leave (d)eleted? 0 files updated, 0 files
merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 status:
 file2: No such file or directory
 C file1
@@ -45,7 +45,7 @@
 use (c)hanged version or leave (d)eleted? unrecognized response
 remote changed file2 which local deleted
 use (c)hanged version or leave (d)eleted? 1 files updated, 0 files
merged, 1 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 status:
 M file2
 R file1
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-merge-remove.out
--- a/tests/test-merge-remove.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-merge-remove.out	Sat Jun 26 13:09:19 2010 +0200
@@ -1,7 +1,7 @@
 created new head
 merging foo1 and foo to foo1
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 n   0         -2 bar
 m 644         14 foo1
 copy: foo -> foo1
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-merge-symlinks.out
--- a/tests/test-merge-symlinks.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-merge-symlinks.out	Sat Jun 26 13:09:19 2010 +0200
@@ -6,7 +6,7 @@
 HG_BASE_ISLINK 0
 merging l
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % merge working directory
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 HG_FILE l2
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-merge-tools.out
--- a/tests/test-merge-tools.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-merge-tools.out	Sat Jun 26 13:09:19 2010 +0200
@@ -53,7 +53,7 @@
 # hg merge -r 2
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 # cat f
 revision 1
 space
@@ -143,7 +143,7 @@
 space
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 # cat f
 revision 1
 space
@@ -165,7 +165,7 @@
 space
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 # cat f
 revision 1
 space
@@ -275,7 +275,7 @@
 # hg update -C 1
 # hg merge -r 2 --config ui.merge=internal:local
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 # cat f
 revision 1
 space
@@ -290,7 +290,7 @@
 # hg update -C 1
 # hg merge -r 2 --config ui.merge=internal:other
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 # cat f
 revision 2
 space
@@ -307,7 +307,7 @@
  no tool found to merge f
 keep (l)ocal or take (o)ther? l
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 # cat f
 revision 1
 space
@@ -374,7 +374,7 @@
 # hg merge -r 3
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 # cat f
 revision 1
 space
@@ -391,7 +391,7 @@
 # hg merge -r 3 --config merge-tools.true.premerge=True
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 # cat f
 revision 1
 space
@@ -415,7 +415,7 @@
 revision 3
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 # cat f
 revision 1
 space
@@ -448,7 +448,7 @@
 space
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 # cat f
 revision 1
 space
@@ -463,7 +463,7 @@
 # hg update -C 1
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 # cat f
 mergeresult
 # hg stat
@@ -477,7 +477,7 @@
 # hg update -C 1
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 # cat f
 mergeresult
 # hg stat
@@ -491,7 +491,7 @@
 # hg update -C 1
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 # cat f
 mergeresult
 # hg stat
@@ -505,7 +505,7 @@
 # hg update -C 1
 merging f
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 # cat f
 revision 0
 space
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-merge-types.out
--- a/tests/test-merge-types.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-merge-types.out	Sat Jun 26 13:09:19 2010 +0200
@@ -10,7 +10,7 @@
  a: update permissions -> e
 update: a 1/1 files (100.00%)
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % symlink is local parent, executable is other
 a has no flags (default for conflicts)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -24,6 +24,6 @@
 update: a 1/1 files (100.00%)
 getting a
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % symlink is other parent, executable is local
 a has no flags (default for conflicts)
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-merge1.out
--- a/tests/test-merge1.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-merge1.out	Sat Jun 26 13:09:19 2010 +0200
@@ -7,7 +7,7 @@
 summary:     commit #1

 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 diff -r d9e5953b9dec b
 --- /dev/null
 +++ b/b
@@ -22,7 +22,7 @@
 merging for b
 merging b
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 diff -r d9e5953b9dec b
 --- /dev/null
 +++ b/b
@@ -38,7 +38,7 @@
 abort: outstanding uncommitted changes (use 'hg status' to list changes)
 %% merge expected!
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 diff -r c1dd73cbf59f b
 --- a/b
 +++ b/b
@@ -54,7 +54,7 @@
 merging for b
 merging b
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 diff -r c1dd73cbf59f b
 --- a/b
 +++ b/b
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-merge10.out
--- a/tests/test-merge10.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-merge10.out	Sat Jun 26 13:09:19 2010 +0200
@@ -10,7 +10,7 @@
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 merging testdir/subdir/a and testdir/a to testdir/subdir/a
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 M testdir/subdir/a
 diff -r f7459795031e testdir/subdir/a
 --- a/testdir/subdir/a
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-merge4.out
--- a/tests/test-merge4.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-merge4.out	Sat Jun 26 13:09:19 2010 +0200
@@ -1,4 +1,4 @@
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 created new head
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-merge6.out
--- a/tests/test-merge6.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-merge6.out	Sat Jun 26 13:09:19 2010 +0200
@@ -12,7 +12,7 @@
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 bar should remain deleted.
 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo
 pulling from ../A2
@@ -23,6 +23,6 @@
 added 1 changesets with 0 changes to 0 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 bar should remain deleted.
 f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644   foo
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-mq-merge.out
--- a/tests/test-mq-merge.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-mq-merge.out	Sat Jun 26 13:09:19 2010 +0200
@@ -28,7 +28,7 @@
 patch didn't work out, merging patcha
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 applying patcha2
 now at: patcha2
 % check patcha is still a git patch
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-mq-safety.out
--- a/tests/test-mq-safety.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-mq-safety.out	Sat Jun 26 13:09:19 2010 +0200
@@ -20,7 +20,7 @@
 marked working directory as branch b
 adding c
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 changeset:   2:65309210bf4e
 branch:      b
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-mq-strip.out
--- a/tests/test-mq-strip.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-mq-strip.out	Sat Jun 26 13:09:19 2010 +0200
@@ -143,7 +143,7 @@

 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % before strip of merge parent
 changeset:   2:65bd5f99a4a3
 user:        test
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-mq.out
--- a/tests/test-mq.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-mq.out	Sat Jun 26 13:09:19 2010 +0200
@@ -497,7 +497,7 @@
 created new head
 merging foo
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 changeset:   3:99615015637b
 tag:         tip
 parent:      2:20cbbe65cff7
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-newbranch.out
--- a/tests/test-newbranch.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-newbranch.out	Sat Jun 26 13:09:19 2010 +0200
@@ -15,7 +15,7 @@
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 foo
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 foo
 changeset:   5:5f8fb06e083e
 branch:      foo
@@ -110,7 +110,7 @@
 adding ff
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 foo
 changeset:   6:f0c74f92a385
 branch:      foo
@@ -174,7 +174,7 @@
 (run 'hg heads .' to see heads)
 % 3 branch heads, explicit merge required
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % 2 branch heads, implicit merge works
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-notify.out
--- a/tests/test-notify.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-notify.out	Sat Jun 26 13:09:19 2010 +0200
@@ -168,7 +168,7 @@
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 created new head
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 pulling from ../a
 searching for changes
 adding changesets
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-parents.out
--- a/tests/test-parents.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-parents.out	Sat Jun 26 13:09:19 2010 +0200
@@ -57,7 +57,7 @@
 % merge working dir with 2 parents, hg parents c
 merging c
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 changeset:   3:02d851b7e549
 user:        test
 date:        Thu Jan 01 00:00:03 1970 +0000
@@ -73,7 +73,7 @@
 % merge working dir with 1 parent, hg parents
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 changeset:   2:6cfac479f009
 user:        test
 date:        Thu Jan 01 00:00:02 1970 +0000
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-parse-date.out
--- a/tests/test-parse-date.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-parse-date.out	Sat Jun 26 13:09:19 2010 +0200
@@ -3,7 +3,7 @@
 changeset 3:107ce1ee2b43 backs out changeset 1:25a1420a55f8
 merging with changeset 3:107ce1ee2b43
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 abort: invalid date: 'should fail'
 abort: date exceeds 32 bits: 100000000000000000
 abort: impossible time zone offset: 1400000
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-pull-update.out
--- a/tests/test-pull-update.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-pull-update.out	Sat Jun 26 13:09:19 2010 +0200
@@ -21,7 +21,7 @@
 (run 'hg heads' to see heads, 'hg merge' to merge)
 merging foo
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % should work
 pulling from ../tt
 searching for changes
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-push-warn.out
--- a/tests/test-push-warn.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-push-warn.out	Sat Jun 26 13:09:19 2010 +0200
@@ -16,7 +16,7 @@
 abort: push creates new remote heads on branch 'default'!
 (did you forget to merge? use push -f to force)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 pushing to ../a
 searching for changes
 adding changesets
@@ -32,7 +32,7 @@
 created new head
 merging foo
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 pushing to ../c
 searching for changes
 abort: push creates new remote heads on branch 'default'!
@@ -182,7 +182,7 @@
 marked working directory as branch b
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 pushing to j
 searching for changes
 abort: push creates new remote branches: b!
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-record.out
--- a/tests/test-record.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-record.out	Sat Jun 26 13:09:19 2010 +0200
@@ -637,7 +637,7 @@
 marked working directory as branch thatbranch
 5 files updated, 0 files merged, 2 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')

 abort: cannot partially commit a merge (use hg commit instead)
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-rename-after-merge.out
--- a/tests/test-rename-after-merge.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-rename-after-merge.out	Sat Jun 26 13:09:19 2010 +0200
@@ -14,7 +14,7 @@
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 M b
 % rename b as c
 A c
@@ -31,13 +31,13 @@
 created new head
 % merge heads
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % commit issue 1476
 copies:      c2 (c1)
 rolling back to revision 2 (undo commit)
 2 files updated, 0 files merged, 2 files removed, 0 files unresolved
 % merge heads again
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % commit issue 1476 with a rename on the other side
 copies:      b2 (b1)
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-rename-dir-merge.out
--- a/tests/test-rename-dir-merge.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-rename-dir-merge.out	Sat Jun 26 13:09:19 2010 +0200
@@ -41,7 +41,7 @@
 update: b/b 6/6 files (100.00%)
 getting b/b
 4 files updated, 0 files merged, 2 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 a/* b/a b/b b/c b/d
 M b/a
 M b/b
@@ -73,7 +73,7 @@
 update:None 1/1 files (100.00%)
 getting a/c to b/c
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 a/* b/a b/b b/c b/d
 A b/c
   a/c
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-rename-dir-merge2.out
--- a/tests/test-rename-dir-merge2.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-rename-dir-merge2.out	Sat Jun 26 13:09:19 2010 +0200
@@ -11,7 +11,7 @@
 added 1 changesets with 1 changes to 1 files (+1 heads)
 (run 'hg heads' to see heads, 'hg merge' to merge)
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 M b/f
 A b/aa/g
   a/aa/g
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-rename-merge1.out
--- a/tests/test-rename-merge1.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-rename-merge1.out	Sat Jun 26 13:09:19 2010 +0200
@@ -33,7 +33,7 @@
 update: b2 3/3 files (100.00%)
 getting b2
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 M b
   a
 M b2
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-rename-merge2.out
--- a/tests/test-rename-merge2.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-rename-merge2.out	Sat Jun 26 13:09:19 2010 +0200
@@ -25,7 +25,7 @@
 merging rev
 my rev at e300d1c794ec+ other rev at 4ce40f5aca24 ancestor rev at 924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M b
   a
@@ -62,7 +62,7 @@
 merging rev
 my rev at 86a2aa42fc76+ other rev at f4db7e329e71 ancestor rev at 924404dff337
 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M a
 M b
@@ -97,7 +97,7 @@
 merging rev
 my rev at e300d1c794ec+ other rev at bdb19105162a ancestor rev at 924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M b
   a
@@ -130,7 +130,7 @@
 merging rev
 my rev at 02963e448370+ other rev at f4db7e329e71 ancestor rev at 924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M b
   a
@@ -159,7 +159,7 @@
 merging rev
 my rev at 94b33a1b7f2d+ other rev at 4ce40f5aca24 ancestor rev at 924404dff337
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M b
 C a
@@ -185,7 +185,7 @@
 merging rev
 my rev at 86a2aa42fc76+ other rev at 97c705ade336 ancestor rev at 924404dff337
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 C a
 C b
@@ -217,7 +217,7 @@
 merging rev
 my rev at 94b33a1b7f2d+ other rev at bdb19105162a ancestor rev at 924404dff337
 1 files updated, 1 files merged, 1 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M b
 --------------
@@ -242,7 +242,7 @@
 merging rev
 my rev at 02963e448370+ other rev at 97c705ade336 ancestor rev at 924404dff337
 0 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 C b
 --------------
@@ -268,7 +268,7 @@
 merging rev
 my rev at 62e7bf090eba+ other rev at 49b6d8032493 ancestor rev at 924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M b
 --------------
@@ -304,7 +304,7 @@
 merging rev
 my rev at 02963e448370+ other rev at fe905ef2c33e ancestor rev at 924404dff337
 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M c
 C b
@@ -331,7 +331,7 @@
 merging rev
 my rev at 86a2aa42fc76+ other rev at af30c7647fc7 ancestor rev at 924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M b
 C a
@@ -361,7 +361,7 @@
 merging rev
 my rev at 59318016310c+ other rev at bdb19105162a ancestor rev at 924404dff337
 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M b
 --------------
@@ -390,7 +390,7 @@
 merging rev
 my rev at 86a2aa42fc76+ other rev at 8dbce441892a ancestor rev at 924404dff337
 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M a
 M b
@@ -420,7 +420,7 @@
 merging rev
 my rev at 59318016310c+ other rev at bdb19105162a ancestor rev at 924404dff337
 0 files updated, 2 files merged, 1 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M b
 --------------
@@ -449,7 +449,7 @@
 merging rev
 my rev at 86a2aa42fc76+ other rev at 8dbce441892a ancestor rev at 924404dff337
 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M a
 M b
@@ -476,7 +476,7 @@
 merging rev
 my rev at 0b76e65c8289+ other rev at 4ce40f5aca24 ancestor rev at 924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M b
 C a
@@ -508,7 +508,7 @@
 merging rev
 my rev at 02963e448370+ other rev at 8dbce441892a ancestor rev at 924404dff337
 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M a
 M b
@@ -539,7 +539,7 @@
 merging rev
 my rev at 0b76e65c8289+ other rev at bdb19105162a ancestor rev at 924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M b
 C a
@@ -572,7 +572,7 @@
 merging rev
 my rev at e300d1c794ec+ other rev at 49b6d8032493 ancestor rev at 924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M b
   a
@@ -604,7 +604,7 @@
 merging rev
 my rev at 62e7bf090eba+ other rev at f4db7e329e71 ancestor rev at 924404dff337
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M b
   a
@@ -642,7 +642,7 @@
 merging rev
 my rev at 02963e448370+ other rev at 2b958612230f ancestor rev at 924404dff337
 1 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 --------------
 M b
   a
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-revset.out
--- a/tests/test-revset.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-revset.out	Sat Jun 26 13:09:19 2010 +0200
@@ -8,7 +8,7 @@
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 marked working directory as branch /a/b/c/
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 marked working directory as branch _a_b_c_
 marked working directory as branch .a.b.c.
 marked working directory as branch all
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-subrepo.out
--- a/tests/test-subrepo.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-subrepo.out	Sat Jun 26 13:09:19 2010 +0200
@@ -58,7 +58,7 @@
 % merge tests
 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 path s
  source   s
  revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
@@ -82,7 +82,7 @@
 update: t 1/1 files (100.00%)
 getting t
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 path s
  source   s
  revision fc627a69481fcbe5f1135069e8a3881c023e4cf5
@@ -114,7 +114,7 @@
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % should conflict
 <<<<<<< local
 conflict
@@ -224,12 +224,12 @@
 adding b
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding c
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 adding .hgsub
 committing subrepository s
@@ -241,7 +241,7 @@
 adding c
 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 adding d
@@ -252,7 +252,7 @@
 committing subrepository s
 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 % test subrepo delete from .hgsubstate
 adding testdelete/nested/foo
 adding testdelete/nested2/foo
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-tags.out
--- a/tests/test-tags.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-tags.out	Sat Jun 26 13:09:19 2010 +0200
@@ -28,7 +28,7 @@
 c8edf04160c7 tip
 % merge the two heads
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 c8edf04160c7+b9154636be93+ tip
 M .hgtags
 % create fake head, make sure tag not visible afterwards
diff -r 8b452fe4bf50 -r 74e62efe1bc8 tests/test-up-local-change.out
--- a/tests/test-up-local-change.out	Mon Jun 21 17:02:48 2010 -0300
+++ b/tests/test-up-local-change.out	Sat Jun 26 13:09:19 2010 +0200
@@ -137,7 +137,7 @@
 merging b
 my b at 802f095af299+ other b at 030602aee63d ancestor b at 000000000000
 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
+(branch merge, either 'commit' or 'hg update -C')
 changeset:   1:802f095af299
 user:        test
 date:        Mon Jan 12 13:46:40 1970 +0000


More information about the Mercurial-devel mailing list