Mercurial > hg
diff templates/index.tmpl @ 3311: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 | d1943df604c4 |
| children | 248e54a9456e |