Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-conflict.out @ 710:ca9353f43345
Use dirstate to check if .hgtags needs to be added.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Use dirstate to check if .hgtags needs to be added.
manifest hash: f90af1553754eb703fc457ffdd5ded0de6fa47e0
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
iD8DBQFC15i1W7P1GVgWeRoRArDvAKCSxWDCbwU12ICwwVUoe753H8GYIwCfZGs0
HcL8cOp+eHz85AMJJE/xfck=
=1xKK
-----END PGP SIGNATURE-----
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Fri, 15 Jul 2005 12:06:29 +0100 |
| parents | eb46971fc57f |
| children | c5df1a9c5276 |
| 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 | |
| 591 | 12 + hg up -m 1 |
| 346 | 13 merge: warning: conflicts during merge |
| 14 merging a | |
| 15 merging a failed! | |
| 16 + hg id | |
|
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
346
diff
changeset
|
17 32e80765d7fe+75234512624c+ tip |
| 392 | 18 + grep -Ev '>>>|<<<' a |
| 346 | 19 something else |
| 20 ======= | |
| 21 something | |
| 22 + hg status | |
| 23 C a | |
| 24 ? .out |