Mercurial > hg
view tests/test-conflict.out @ 826:16700cdd9055
Allow import from files with spaces
Index: hg/mercurial/commands.py
===================================================================
| author | Kyle Moffett <mrmacman_g4@mac.com> |
|---|---|
| date | Thu, 04 Aug 2005 13:22:36 -0800 |
| 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