Mercurial > hg
view tests/test-conflict.out @ 7475:90d8dfb481e7
Rewrite svn tests using svndump
They are:
- faster to run (12s vs 30s in test-convert-svn-branches case)
- easier to craft
- easier to debug
- more portable
| author | Patrick Mezard <pmezard@gmail.com> |
|---|---|
| date | Sat, 06 Dec 2008 20:07:44 +0100 |
| parents | 92ccccb55ba3 |
| children | 9fe7e6acf525 |
line wrap: on
line source
1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head merging a warning: conflicts during merge. merging a failed! 0 files updated, 0 files merged, 0 files removed, 1 files unresolved use 'hg resolve' to retry unresolved file merges e7fe8eb3e180+0d24b7662d3e+ tip <<<<<<< local something else ======= something >>>>>>> other M a ? a.orig