view tests/test-issue619.out @ 10372:27d542bc0f5b

qnew: ignore force option This makes the default behavior the same as qnew --force, and deprecates the force option.
author Augie Fackler <durin42@gmail.com>
date Sun, 07 Feb 2010 07:37:05 -0600
parents cdc458b12f0f
children 5b48d819d5f9
line wrap: on
line source

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