tests/test-merge5.out

contrib: add Chris Mason's stand-alone diff tool

This uses Mercurial's diff algorithm to generate unidiffs like the traditional diff tool.

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)