##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output...
Add a pointer to "hg -v help" to the bottom of hg help {,cmd} output This should make it easier to discover global options. As a bonus, they are no longer displayed by something like a hg -v help dates
Matt Mackall - - Load All Authors

File last commit:

r4304:4787e2b0 default
r4315:bc6f5a1d default
Show More
test-merge-local.out
67 lines | 1.7 KiB | text/plain | TextLexer
/ tests / test-merge-local.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Add instructions how to redo/finish failed merge with local working directory....
 r3869 # revision 0
adding copy
adding move
adding remove
adding unchanged
adding zzz1_merge_ok
adding zzz2_merge_bad
# revision 1
# local changes to revision 0
4 files updated, 0 files merged, 3 files removed, 0 files unresolved
--- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
+new last line
--- a/zzz2_merge_bad
+++ b/zzz2_merge_bad
+another last line
M zzz1_merge_ok
M zzz2_merge_bad
# local merge with bad merge tool
merging zzz1_merge_ok
merging zzz1_merge_ok failed!
merging zzz2_merge_bad
merging zzz2_merge_bad failed!
Matt Mackall
merge: fix a bug where copies were ignored
 r4304 3 files updated, 0 files merged, 1 files removed, 2 files unresolved
Thomas Arendsen Hein
Add instructions how to redo/finish failed merge with local working directory....
 r3869 There are unresolved merges with locally modified files.
You can redo the full merge using:
hg update 0
hg update 1
2 files updated, 0 files merged, 3 files removed, 0 files unresolved
--- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
+new last line
--- a/zzz2_merge_bad
+++ b/zzz2_merge_bad
+another last line
M zzz1_merge_ok
M zzz2_merge_bad
# local merge with conflicts
merge: warning: conflicts during merge
merging zzz1_merge_ok
merging zzz2_merge_bad
merging zzz2_merge_bad failed!
Matt Mackall
merge: fix a bug where copies were ignored
 r4304 3 files updated, 1 files merged, 1 files removed, 1 files unresolved
Thomas Arendsen Hein
Add instructions how to redo/finish failed merge with local working directory....
 r3869 There are unresolved merges with locally modified files.
You can finish the partial merge using:
hg update 0
hg update 1
2 files updated, 0 files merged, 3 files removed, 0 files unresolved
--- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
+new first line
+new last line
--- a/zzz2_merge_bad
+++ b/zzz2_merge_bad
+another last line
+=======
+new last line
M zzz1_merge_ok
M zzz2_merge_bad
# local merge without conflicts
merging zzz1_merge_ok
Matt Mackall
merge: fix a bug where copies were ignored
 r4304 4 files updated, 1 files merged, 1 files removed, 0 files unresolved
Thomas Arendsen Hein
Add instructions how to redo/finish failed merge with local working directory....
 r3869 --- a/zzz1_merge_ok
+++ b/zzz1_merge_ok
+new last line
M zzz1_merge_ok
? zzz2_merge_bad.orig