diff admin/emacs-pretesters @ 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 d153e68474d4
children dd7c098af727 ddedcecb18ef
line wrap: on
line diff