Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-double-merge @ 5166:7706ff46ef45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
The >| redirection does not exist in plain sh.
author Thomas Arendsen Hein <thomas@intevation.de>
date Thu, 02 Aug 2007 14:51:49 +0200
parents f191bc3916f7
children
comparison
equal deleted inserted replaced
5164:e5b21a549cc5 5166:7706ff46ef45
13 hg ci -m 'cp foo bar; change both' -d "1000000 0" 13 hg ci -m 'cp foo bar; change both' -d "1000000 0"
14 14
15 # in another branch, change foo in a way that doesn't conflict with 15 # in another branch, change foo in a way that doesn't conflict with
16 # the other changes 16 # the other changes
17 hg up -qC 0 17 hg up -qC 0
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 --debug 23 hg merge --debug