diff contrib/mergetools.hgrc @ 15748:6eb5bbaa1e73 stable

fetch: patch cornercase in children calculation (issue2773)
author Matt Mackall <mpm@selenic.com>
date Fri, 30 Dec 2011 14:31:59 -0600
parents a87a0fcb412f
children 93bc65e970c0
line wrap: on
line diff