tests/test-issue619.out
author Wagner Bruna <wbruna@softwareexpress.com.br>
Mon, 26 Oct 2009 12:32:14 -0200
changeset 9771 ece7119aa747
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
i18n-pt_BR: synchronized with e06c940d554d

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: can't merge with ancestor
done