comparison hgeditor @ 5708:f6bf89722e29

merge: add flag merging intelligence - properly handle all 27 combinations of flags - prompt on conflicts
author Matt Mackall <mpm@selenic.com>
date Thu, 27 Dec 2007 22:47:44 -0600
parents b5bbfa18daf7
children 43337076ba92
comparison
equal deleted inserted replaced
5707:76dd039c2bad 5708:f6bf89722e29