Mercurial > hg
view contrib/plan9/hgrc.d/9diff.rc @ 27136:29b08ca680b0
test-merge-changedelete.t: print out debugmergestate
We're going to use this to verify the merge state in upcoming patches.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 25 Nov 2015 14:26:46 -0800 |
parents | ba89c3872801 |
children |
line wrap: on
line source
# The 9diff extdiff command generates diff(1) compatible output # suitable for use with the plumber(4). [extensions] extdiff = [extdiff] 9diff = /bin/mercurial/9diff -cm $parent $child $root