Mercurial > hg
diff tests/test-conflict.out @ 346:f69a5d2d4fe1
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 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-conflict.out Wed Jun 15 00:27:20 2005 -0800 @@ -0,0 +1,32 @@ ++ hg init ++ echo nothing ++ hg add a ++ hg commit -t ancestor -u test -d '0 0' ++ echo something ++ hg commit -t branch1 -u test -d '0 0' ++ hg co 0 ++ echo 'something else' ++ hg commit -t branch2 -u test -d '0 0' ++ export HGMERGE=merge ++ HGMERGE=merge ++ hg -d up -m 1 +merge: warning: conflicts during merge +resolving manifests + ancestor 1c6e5a12 local 35fedfab remote a5801785 + a versions differ, resolve +working dir created .out, keeping +merging a +resolving a +file a: other d7250518 ancestor 68ba9db7 +merging a failed! ++ hg id +32e80765+75234512+ tip ++ cat a ++ grep -v '>>>' ++ grep -v '<<<' +something else +======= +something ++ hg status +C a +? .out