Parent Directory | Revision Log | Patch
revision 1.36 by lektu, Thu Jun 16 14:34:12 2005 UTC | revision 1.37 by rms, Sun Jul 3 16:12:14 2005 UTC | |
---|---|---|
# | Line 48 | Line 48 |
48 | (eval-when-compile (require 'cl)) | (eval-when-compile (require 'cl)) |
49 | ||
50 | ||
51 | ;;; The real definition comes later. | |
52 | (defvar smerge-mode) | |
53 | ||
54 | (defgroup smerge () | (defgroup smerge () |
55 | "Minor mode to resolve diff3 conflicts." | "Minor mode to resolve diff3 conflicts." |
56 | :group 'tools | :group 'tools |
|
savannah-hackers-public@gnu.org | ViewVC Help |
Powered by ViewVC 1.1.26 |