Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-conflict.out @ 801:1f9ec150a476
Updated output of tests.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Fri, 29 Jul 2005 15:21:02 +0100 |
| parents | 7e4843b7efd2 |
| children | 8f5637f0a0c0 |
line wrap: on
line diff
--- a/tests/test-conflict.out +++ b/tests/test-conflict.out @@ -1,24 +1,17 @@ + hg init -+ echo nothing + hg add a -+ hg commit -m ancestor -d '0 0' -+ echo something -+ hg commit -m branch1 -d '0 0' ++ hg commit -m ancestor -d 0 0 ++ hg commit -m branch1 -d 0 0 + hg co 0 -+ echo 'something else' -+ hg commit -m branch2 -d '0 0' -+ export HGMERGE=merge -+ HGMERGE=merge ++ hg commit -m branch2 -d 0 0 + hg up -m 1 merge: warning: conflicts during merge merging a merging a failed! + hg id 32e80765d7fe+75234512624c+ tip -+ grep -Ev '>>>|<<<' a something else ======= something + hg status M a -? .out