diff admin/notes/iftc @ 87767:90318261ac4d

(smerge-refine): Also work on "same change conflicts". (smerge-makeup-conflict): New command.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Tue, 15 Jan 2008 21:40:09 +0000
parents 695cf19ef79e
children 375f2633d815 ef719132ddfa
line wrap: on
line diff