tests/test-issue619.out
author Mads Kiilerich <mads@kiilerich.com>
Tue, 08 Sep 2009 01:26:15 +0200
changeset 9434 f5ce9b052747
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
test-convert-git: Use ~ instead of ^ Solaris sh interprets ^ as pipe symbol and the test thus failed in strange ways. git can however use of HEAD~ instead of HEAD^.

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