diff contrib/mergetools.hgrc @ 16072:bcb973abcc0b

subrepo: add basestate method This will allow us to sort out what's going on with state .hgsubstate files more precisely.
author Matt Mackall <mpm@selenic.com>
date Mon, 06 Feb 2012 15:00:08 -0600
parents a87a0fcb412f
children 93bc65e970c0
line wrap: on
line diff