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

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

fetch: switch the default parent used for a merge...
fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.
Matt Mackall - - Load All Authors

File last commit:

r6004:5af5f0f9 default
r6206:0b6f1249 default
Show More
test-conflict.out
16 lines | 398 B | text/plain | TextLexer
/ tests / test-conflict.out
History | Source | Raw |Copy content |Copy permalink
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall
merge: allow smarter tool configuration...
 r6004 merging a
Alexis S. L. Carvalho
change tests to use simplemerge by default
 r4365 warning: conflicts during merge.
mpm@selenic.com
merge3: fix argument order...
 r346 merging a failed!
Thomas Arendsen Hein
Make hg update more verbose by default (issue12)...
 r2175 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
There are unresolved merges, you can redo the full merge using:
hg update -C 2
hg merge 1
Thomas Arendsen Hein
Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....
 r1933 e7fe8eb3e180+0d24b7662d3e+ tip
Matt Mackall
merge: allow smarter tool configuration...
 r6004 <<<<<<< local
mpm@selenic.com
merge3: fix argument order...
 r346 something else
=======
something
Alexis S. L. Carvalho
run-tests.py: pass -L/--label to simplemerge...
 r4387 >>>>>>> other
mpm@selenic.com
Update test output for status change...
 r748 M a
Matt Mackall
merge: allow smarter tool configuration...
 r6004 ? a.orig