[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el

2005-09-08 Thread Richard M . Stallman
Index: emacs/lisp/smerge-mode.el diff -c emacs/lisp/smerge-mode.el:1.43 emacs/lisp/smerge-mode.el:1.44 *** emacs/lisp/smerge-mode.el:1.43 Fri Aug 26 09:37:04 2005 --- emacs/lisp/smerge-mode.el Fri Sep 9 01:16:05 2005 *** *** 372,378 some major modes. Uses `smerge-resolve

[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el

2005-08-26 Thread Juanma Barranquero
Index: emacs/lisp/smerge-mode.el diff -c emacs/lisp/smerge-mode.el:1.42 emacs/lisp/smerge-mode.el:1.43 *** emacs/lisp/smerge-mode.el:1.42 Thu Aug 25 20:13:38 2005 --- emacs/lisp/smerge-mode.el Fri Aug 26 09:37:04 2005 *** *** 131,137 (defface smerge-refined-change '

[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el

2005-08-25 Thread Stefan Monnier
Index: emacs/lisp/smerge-mode.el diff -c emacs/lisp/smerge-mode.el:1.41 emacs/lisp/smerge-mode.el:1.42 *** emacs/lisp/smerge-mode.el:1.41 Mon Aug 22 14:38:51 2005 --- emacs/lisp/smerge-mode.el Thu Aug 25 20:13:38 2005 *** *** 129,134 --- 129,138 (put 'smerge-markers-f

[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el

2005-08-22 Thread Stefan Monnier
Index: emacs/lisp/smerge-mode.el diff -c emacs/lisp/smerge-mode.el:1.40 emacs/lisp/smerge-mode.el:1.41 *** emacs/lisp/smerge-mode.el:1.40 Sat Aug 6 22:13:43 2005 --- emacs/lisp/smerge-mode.el Mon Aug 22 14:38:51 2005 *** *** 53,59 (defvar smerge-mode) (defgroup smerg

[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el

2005-08-06 Thread Thien-Thi Nguyen
Index: emacs/lisp/smerge-mode.el diff -c emacs/lisp/smerge-mode.el:1.39 emacs/lisp/smerge-mode.el:1.40 *** emacs/lisp/smerge-mode.el:1.39 Tue Jul 26 16:07:55 2005 --- emacs/lisp/smerge-mode.el Sat Aug 6 22:13:43 2005 *** *** 1,6 ;;; smerge-mode.el --- Minor mode to resolv

[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el

2005-07-26 Thread Stefan Monnier
Index: emacs/lisp/smerge-mode.el diff -c emacs/lisp/smerge-mode.el:1.38 emacs/lisp/smerge-mode.el:1.39 *** emacs/lisp/smerge-mode.el:1.38 Mon Jul 4 23:08:58 2005 --- emacs/lisp/smerge-mode.el Tue Jul 26 16:07:55 2005 *** *** 670,676 (ediff-cleanup-mess)

[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el

2005-07-04 Thread Lute Kamstra
Index: emacs/lisp/smerge-mode.el diff -c emacs/lisp/smerge-mode.el:1.37 emacs/lisp/smerge-mode.el:1.38 *** emacs/lisp/smerge-mode.el:1.37 Sun Jul 3 16:12:14 2005 --- emacs/lisp/smerge-mode.el Mon Jul 4 23:08:58 2005 *** *** 19,26 ;; You should have received a copy of

[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el

2005-07-03 Thread Richard M . Stallman
Index: emacs/lisp/smerge-mode.el diff -c emacs/lisp/smerge-mode.el:1.36 emacs/lisp/smerge-mode.el:1.37 *** emacs/lisp/smerge-mode.el:1.36 Thu Jun 16 14:34:12 2005 --- emacs/lisp/smerge-mode.el Sun Jul 3 16:12:14 2005 *** *** 48,53 --- 48,56 (eval-when-compile (requir

[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el

2005-06-16 Thread Juanma Barranquero
Index: emacs/lisp/smerge-mode.el diff -c emacs/lisp/smerge-mode.el:1.35 emacs/lisp/smerge-mode.el:1.36 *** emacs/lisp/smerge-mode.el:1.35 Fri Jun 10 08:48:07 2005 --- emacs/lisp/smerge-mode.el Thu Jun 16 14:34:12 2005 *** *** 247,253 (defun smerge-ensure-match (n) (

[Emacs-diffs] Changes to emacs/lisp/smerge-mode.el

2005-06-10 Thread Miles Bader
Index: emacs/lisp/smerge-mode.el diff -c emacs/lisp/smerge-mode.el:1.34 emacs/lisp/smerge-mode.el:1.35 *** emacs/lisp/smerge-mode.el:1.34 Fri Apr 8 14:26:13 2005 --- emacs/lisp/smerge-mode.el Fri Jun 10 08:48:07 2005 *** *** 75,81 :group 'smerge :type 'boolean) !