diff .hgsub @ 132:d190d7987730

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