tests/test-merge5.out
author mason@suse.com
Sat, 28 Jan 2006 17:16:15 +1300
changeset 1644 e7e6504c4989
parent 925 5a034646e472
child 2019 ced2d3620f95
permissions -rw-r--r--
Remove duplicate bunidiff code from hgdiff, importing from mdiff.py instead

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)