Mercurial > hg > mercurial-crew-with-dirclash
diff templates/changelog.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 | 46188b9528ca |
| children | 887da2247b57 |