tests/test-issue619.out
author Daniel Dumitriu <daniel.dumitriu@gmail.com>
Wed, 25 Aug 2010 12:20:10 +0200
changeset 12242 403bb6067736
parent 11417 6f1d1ed3e19a
permissions -rw-r--r--
i18n: merged in strings from hg cset ce818cf215dc

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