Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-conflict.out @ 850:d2bf8b9534b1
Add temporary documentation files and profiling output to .hgignore
| author | Samuel Tardieu <sam@rfc1149.net> |
|---|---|
| date | Sat, 06 Aug 2005 21:18:21 +0100 |
| parents | 0902ffece4b4 |
| children | 5a034646e472 |
line wrap: on
line source
+ hg init + hg add a + hg commit -m ancestor -d 0 0 + hg commit -m branch1 -d 0 0 + hg co 0 + 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 something else ======= something + hg status M a