Mercurial > hg

diff mercurial/merge.py @ 3293:4546a5e31cb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use filelog.cmp in checkfilemerge
author Matt Mackall <mpm@selenic.com>
date Sun, 08 Oct 2006 20:18:59 -0500
parents 764688cf51e5
children 72d1e521da77
line wrap: on
line diff