Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-conflict.out @ 377:e5d769afd3ef
Merge with TAH
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Merge with TAH
manifest hash: f73215065ecbcfd9a0d0964de5ed73a392837a56
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.0 (GNU/Linux)
iD8DBQFCsQqNywK+sNU5EO8RAiuOAJ4lL23LcxAkbPHy33snasBgrkhNxQCgkBLO
ohB0/EA2dAvQtu5sMSW03D8=
=lF8D
-----END PGP SIGNATURE-----
| author | mpm@selenic.com |
|---|---|
| date | Wed, 15 Jun 2005 21:13:49 -0800 |
| parents | f07d00fcd281 f69a5d2d4fe1 |
| children | ee4c80d294e5 |
| rev | line source |
|---|---|
| 346 | 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 | |
|
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
346
diff
changeset
|
15 ancestor 1c6e5a129854 local 35fedfab3325 remote a58017859bdc |
| 346 | 16 a versions differ, resolve |
| 17 working dir created .out, keeping | |
| 18 merging a | |
| 19 resolving a | |
|
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
346
diff
changeset
|
20 file a: other d7250518cb1b ancestor 68ba9db7a9e4 |
| 346 | 21 merging a failed! |
| 22 + hg id | |
|
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
346
diff
changeset
|
23 32e80765d7fe+75234512624c+ tip |
| 346 | 24 + cat a |
| 25 + grep -v '>>>' | |
| 26 + grep -v '<<<' | |
| 27 something else | |
| 28 ======= | |
| 29 something | |
| 30 + hg status | |
| 31 C a | |
| 32 ? .out |