tests/test-issue619.out
changeset 12195 ee41be2bbf5a
parent 12194 9e40ea08c2ab
child 12196 e42bc7f66e25
--- a/tests/test-issue619.out	Fri Sep 03 22:10:08 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-adding a
-marked working directory as branch b
-adding b
-0 files updated, 0 files merged, 1 files removed, 0 files unresolved
-fast-forward
-1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-(branch merge, don't forget to commit)
-bogus fast-forward should fail
-abort: merging with a working directory ancestor has no effect
-done