tests/test-manifest.hg
author Matt Mackall <mpm@selenic.com>
Sun, 03 Feb 2008 19:29:05 -0600
changeset 6009 f077815932ce
parent 5406 f11554a097c8
permissions -rw-r--r--
filemerge: remove the hgmerge script This is now better handled using [merge-tools] and [merge-patterns] in hgrc.

(binary:application/octet-stream)