comparison contrib/tcsh_completion_build.sh @ 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 2073e5a71008
children 2b2548342265
comparison
equal deleted inserted replaced
3310:0e370798eebf 3311:966632304dde