diff doc/hgmerge.1.txt @ 3293:4546a5e31cb8

Use filelog.cmp in checkfilemerge
author Matt Mackall <mpm@selenic.com>
date Sun, 08 Oct 2006 20:18:59 -0500
parents 345bac2bc4ec
children 63b9d2deed48
line wrap: on
line diff