diff hgext/hgk.py @ 3317:966632304dde

merge: shortcircuit filemerge for identical files - use filectx.cmp to compare files - move merge messages into filemerge - kill the redundant resolving message - update tests
author Matt Mackall <mpm@selenic.com>
date Tue, 10 Oct 2006 01:16:06 -0500
parents eb0906ebba81
children 0e68608bd11d
line wrap: on
line diff