Mercurial > hg

comparison tests/test-double-merge @ 8387:50b6af595e0c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: add -S/--show option to review revisions without merging
author Dirkjan Ochtman <dirkjan@ochtman.nl>
date Thu, 14 May 2009 16:03:17 +0200
parents 99a4592ea886
children 6d36fc70754e
comparison
equal deleted inserted replaced
8386:4aad982111b6 8387:50b6af595e0c
18 echo line 0 > foo 18 echo line 0 > foo
19 hg cat foo >> foo 19 hg cat foo >> foo
20 hg ci -m 'change foo' -d "1000000 0" 20 hg ci -m 'change foo' -d "1000000 0"
21 21
22 # we get conflicts that shouldn't be there 22 # we get conflicts that shouldn't be there
23 hg merge -S
23 hg merge --debug 24 hg merge --debug
24 25
25 echo "-- foo --" 26 echo "-- foo --"
26 cat foo 27 cat foo
27 28