comparison templates/rss/header.tmpl @ 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 e281903c9d32
children a2179e78d18b
comparison
equal deleted inserted replaced
3316:0e370798eebf 3317:966632304dde