Index: emacs/lisp/ChangeLog
diff -c emacs/lisp/ChangeLog:1.8103 emacs/lisp/ChangeLog:1.8104
*** emacs/lisp/ChangeLog:1.8103 Thu Aug 25 19:11:00 2005
--- emacs/lisp/ChangeLog Thu Aug 25 20:13:38 2005
***************
*** 1,3 ****
--- 1,15 ----
+ 2005-08-25 Stefan Monnier <[EMAIL PROTECTED]>
+
+ * smerge-mode.el (smerge-remove-props): Make the args non-optional.
+ (smerge-keep-n): Remove props.
+ (smerge-keep-base, smerge-keep-other, smerge-keep-mine)
+ (smerge-keep-current, smerge-kill-current): Don't remove props anymore
+ now that it's done in smerge-keep-n.
+ (smerge-refined-change): New face.
+ (smerge-refine-chopup-region, smerge-refine-highlight-change)
+ (smerge-refine): New funs.
+ (smerge-basic-map): Bind smerge-refine.
+
2005-08-25 Juri Linkov <[EMAIL PROTECTED]>
* progmodes/grep.el (grep, grep-mode): Make buffer-local variables
_______________________________________________
Emacs-diffs mailing list
Emacs-diffs@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-diffs
