comparison contrib/simplemerge @ 30326:eac5c1737f79

keyword: handle filectx _customcmp Suggested by Yuya Nishihara: https://www.mercurial-scm.org/pipermail/mercurial-devel/2016-October/089461.html Related to issue5364.
author Christian Ebert <blacktrash@gmx.net>
date Mon, 17 Oct 2016 17:42:46 +0200
parents 863075fd4cd0
children d83ca854fa21
comparison
equal deleted inserted replaced
30325:f6369544bf85 30326:eac5c1737f79