Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-conflict.out @ 808:8f5637f0a0c0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with TAH
author mpm@selenic.com
date Sat, 30 Jul 2005 08:35:29 -0800
parents 7e4843b7efd2 1f9ec150a476
children 0902ffece4b4
comparison
equal deleted inserted replaced
788:64d2a558c943 808:8f5637f0a0c0
1 + hg init 1 + hg init
2 + echo nothing
3 + hg add a 2 + hg add a
4 + hg commit -m ancestor -d '0 0' 3 + hg commit -m ancestor -d 0 0
5 + echo something 4 + hg commit -m branch1 -d 0 0
6 + hg commit -m branch1 -d '0 0'
7 + hg co 0 5 + hg co 0
8 + echo 'something else' 6 + hg commit -m branch2 -d 0 0
9 + hg commit -m branch2 -d '0 0'
10 + export HGMERGE=merge
11 + HGMERGE=merge
12 + hg up -m 1 7 + hg up -m 1
13 merge: warning: conflicts during merge 8 merge: warning: conflicts during merge
14 merging a 9 merging a
15 merging a failed! 10 merging a failed!
16 + hg id 11 + hg id
17 32e80765d7fe+75234512624c+ tip 12 32e80765d7fe+75234512624c+ tip
18 + grep -Ev '>>>|<<<' a
19 something else 13 something else
20 ======= 14 =======
21 something 15 something
22 + hg status 16 + hg status
23 M a 17 M a
24 ? .out