tests/test-merge5.out
author Thomas Arendsen Hein <thomas@intevation.de>
Fri, 24 Mar 2006 15:03:15 +0100
changeset 1996 4c70b10f0418
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Don't mention deprecated HGEDITOR variable in the help text of commit.

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)