Mercurial > hg

view tests/test-merge5.out @ 1644:e7e6504c4989

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove duplicate bunidiff code from hgdiff, importing from mdiff.py instead
author mason@suse.com
date Sat, 28 Jan 2006 17:16:15 +1300
parents 5a034646e472
children ced2d3620f95
line wrap: on
line source

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)