comparison build/update_subrepos.sh @ 132:d190d7987730

Use `kdiff3` for merging on MacOS.
author Ludovic Chabant <ludovic@chabant.com>
date Thu, 26 Sep 2013 22:34:57 -0700
parents 2f5ac9cd3a5e
children
comparison
equal deleted inserted replaced
131:a273867b6a0d 132:d190d7987730