diff options
| author | Pavel Janík <Pavel@Janik.cz> | 2001-07-16 07:46:48 +0000 |
|---|---|---|
| committer | Pavel Janík <Pavel@Janik.cz> | 2001-07-16 07:46:48 +0000 |
| commit | 3afbc435ac942072f42bf795dea22131b03c8d93 (patch) | |
| tree | 6715b27c5ef636a36a491d4b6f5d39896cf7b472 /lisp/ediff-merg.el | |
| parent | 5d3d1e3209acdc38227b0ec5bdd8c4a31f58d8d4 (diff) | |
| download | emacs-3afbc435ac942072f42bf795dea22131b03c8d93.tar.gz | |
Some fixes to follow coding conventions.
Diffstat (limited to 'lisp/ediff-merg.el')
| -rw-r--r-- | lisp/ediff-merg.el | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/lisp/ediff-merg.el b/lisp/ediff-merg.el index 89e16791076..5242014eb7e 100644 --- a/lisp/ediff-merg.el +++ b/lisp/ediff-merg.el @@ -21,6 +21,8 @@ ;; Free Software Foundation, Inc., 59 Temple Place - Suite 330, ;; Boston, MA 02111-1307, USA. +;;; Commentary: + ;;; Code: (provide 'ediff-merg) @@ -385,4 +387,4 @@ Combining is done according to the specifications in variable ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body)) ;;; End: -;; ediff-merg.el ends here +;;; ediff-merg.el ends here |