diff hgwebdir.cgi @ 6002:abd66eb0889e

merge: move the bulk of simplemerge into core - keep existing simplemerge command in contrib - clean up test interface
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