tests/test-issue619.out
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
Wed, 30 Jun 2010 13:03:48 +0900
branchstable
changeset 11482 fa19c7418f83
parent 11417 6f1d1ed3e19a
permissions -rw-r--r--
i18n-ja: synchronized with 13d02d6677f2

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