Mercurial > hg > mercurial-crew-with-dirclash

comparison tests/test-conflict.out @ 346:f69a5d2d4fe1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge3: fix argument order -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 merge3: fix argument order We were passing the wrong argument order to hgmerge. Add a merge conflict test case. manifest hash: 2d88786a3f31dcaa9d44f564c21f0d2a4f14f09c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD4DBQFCr+ZoywK+sNU5EO8RAouJAKCOx5oxhVXkLqsfCPBXx0+wP5IeogCYoZzF ooZT2fyN3tL3uVM2YP8KcA== =O4fE -----END PGP SIGNATURE-----
author mpm@selenic.com
date Wed, 15 Jun 2005 00:27:20 -0800
parents
children f07d00fcd281 e5d769afd3ef
comparison
equal deleted inserted replaced
345:9d8d9207c0b3 346:f69a5d2d4fe1
1 + hg init
2 + echo nothing
3 + hg add a
4 + hg commit -t ancestor -u test -d '0 0'
5 + echo something
6 + hg commit -t branch1 -u test -d '0 0'
7 + hg co 0
8 + echo 'something else'
9 + hg commit -t branch2 -u test -d '0 0'
10 + export HGMERGE=merge
11 + HGMERGE=merge
12 + hg -d up -m 1
13 merge: warning: conflicts during merge
14 resolving manifests
15 ancestor 1c6e5a12 local 35fedfab remote a5801785
16 a versions differ, resolve
17 working dir created .out, keeping
18 merging a
19 resolving a
20 file a: other d7250518 ancestor 68ba9db7
21 merging a failed!
22 + hg id
23 32e80765+75234512+ tip
24 + cat a
25 + grep -v '>>>'
26 + grep -v '<<<'
27 something else
28 =======
29 something
30 + hg status
31 C a
32 ? .out