diff .hgsubstate @ 132:d190d7987730

Use `kdiff3` for merging on MacOS.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 26 Sep 2013 22:34:57 -0700
parents a273867b6a0d
children aec168618b7b
line wrap: on
line diff