log lisp/smerge-mode.el @ 72497:6cc945ca398a

age author description
Sun, 30 Apr 2006 15:49:08 +0000 Stefan Monnier Update my email address.
Mon, 06 Feb 2006 15:23:23 +0000 Thien-Thi Nguyen Update years in copyright notice; nfc.
Wed, 26 Oct 2005 08:38:07 +0000 Romain Francoise Add 'tools' to file keywords.
Fri, 23 Sep 2005 18:15:20 +0000 Stefan Monnier (smerge-remove-props): Cause re-highlighting of the whole conflict.
Fri, 09 Sep 2005 01:16:05 +0000 Richard M. Stallman (smerge-resolve): Pass args to smerge-remove-props.
Fri, 26 Aug 2005 09:37:04 +0000 Juanma Barranquero (smerge-refined-change): Add :group.
Thu, 25 Aug 2005 20:13:38 +0000 Stefan Monnier (smerge-remove-props): Make the args non-optional.