diff contrib/mergetools.hgrc @ 18716:963468e9f9e5

merge with crew
author Matt Mackall <mpm@selenic.com>
date Fri, 22 Feb 2013 13:46:54 -0600
parents ec9b9968b7f8
children c4266e9afc4f
line wrap: on
line diff