comparison contrib/mergetools.hgrc @ 18554:1516d5624a29

merge with stable
author Matt Mackall <mpm@selenic.com>
date Mon, 04 Feb 2013 16:39:02 -0600
parents bafbfe0b450c
children 6a012704c841
comparison
equal deleted inserted replaced
18551:d6fb7bbec16a 18554:1516d5624a29