comparison hgeditor @ 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 b5bbfa18daf7
children 43337076ba92
comparison
equal deleted inserted replaced
6001:30d2fecaab76 6002:abd66eb0889e