tests/test-issue619.out
author Diego de Oliveira <diego@diegooliveira.com>
Sun, 19 Apr 2009 20:37:26 -0300
changeset 8121 aef8b864a304
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
i18n: add Brazilian Portuguese translation

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