diff hgwebdir.cgi @ 6009:f077815932ce

filemerge: remove the hgmerge script This is now better handled using [merge-tools] and [merge-patterns] in hgrc.
author Matt Mackall <mpm@selenic.com>
date Sun, 03 Feb 2008 19:29:05 -0600
parents b913d3aacddc
children 4baad19c4801 90e5c82a3859
line wrap: on
line diff