Mercurial > hg > mercurial-crew-with-dirclash
diff doc/Makefile @ 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 | 6901d3545021 |
children | 9d7ac8613340 |