view tests/test-issue619.out @ 11924:487152f29db2

tests: unify test-debugcomplete
author Pradeepkumar Gayam <in3xes@gmail.com>
date Tue, 17 Aug 2010 18:07:05 +0530
parents 6f1d1ed3e19a
children
line wrap: on
line source

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