tests/test-merge4.out
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Thu, 28 Feb 2008 17:51:04 +0100
changeset 6181 d500aeb8092e
parent 2175 b2ae81a7df29
child 6336 4b0c9c674707
permissions -rw-r--r--
warning on push should mention heads, not branches This makes the concept easier to relate to similar messages given on pull, and allows for a distinction between heads and (named) branches.

0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)