tests/test-issue619.out
author Steve Losh <steve@stevelosh.com>
Thu, 17 Sep 2009 22:30:45 -0400
changeset 9460 552c5a5a3502
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
contrib/bash_completion: add tab completion for some bookmark commands

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