tests/test-merge5.out
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
Tue, 27 Dec 2005 13:12:53 -0600
changeset 1599 f93fde8f5027
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
remove the gpg stuff from hgeditor (superseded by the signing extension) remove the gpg stuff from hgeditor, update the comments to make it clear it can be used to show a diff while commiting

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)