tests/test-hup.out
author Thomas Arendsen Hein <thomas@intevation.de>
Thu, 04 Aug 2005 17:23:31 +0100
changeset 830 ca080d28d0af
parent 814 0902ffece4b4
child 925 5a034646e472
permissions -rw-r--r--
If rejects are empty after using the editor, merge with diff+patch was ok.

+ hg init
+ hg serve --stdio
0
0
adding changesets
killed!
transaction abort!
rollback completed
00changelog.d
00changelog.i
data
journal.dirstate