| blob | 1b76db41449ed3e89f5cbc48b5a27d07115f0c78 |
1 ;;; ediff.el --- a comprehensive visual interface to diff & patch
3 ;; Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
4 ;; 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc.
6 ;; Author: Michael Kifer <kifer@cs.stonybrook.edu>
7 ;; Created: February 2, 1994
8 ;; Keywords: comparing, merging, patching, tools, unix
10 ;; Yoni Rabkin <yoni@rabkins.net> contacted the maintainer of this
11 ;; file on 20/3/2008, and the maintainer agreed that when a bug is
12 ;; filed in the Emacs bug reporting system against this file, a copy
13 ;; of the bug report be sent to the maintainer's email address.
19 ;; This file is part of GNU Emacs.
21 ;; GNU Emacs is free software: you can redistribute it and/or modify
22 ;; it under the terms of the GNU General Public License as published by
23 ;; the Free Software Foundation, either version 3 of the License, or
24 ;; (at your option) any later version.
26 ;; GNU Emacs is distributed in the hope that it will be useful,
27 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of
28 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
29 ;; GNU General Public License for more details.
31 ;; You should have received a copy of the GNU General Public License
32 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
34 ;;; Commentary:
36 ;; Never read that diff output again!
37 ;; Apply patch interactively!
38 ;; Merge with ease!
40 ;; This package provides a convenient way of simultaneous browsing through
41 ;; the differences between a pair (or a triple) of files or buffers. The
42 ;; files being compared, file-A, file-B, and file-C (if applicable) are
43 ;; shown in separate windows (side by side, one above the another, or in
44 ;; separate frames), and the differences are highlighted as you step
45 ;; through them. You can also copy difference regions from one buffer to
46 ;; another (and recover old differences if you change your mind).
48 ;; Ediff also supports merging operations on files and buffers, including
49 ;; merging using ancestor versions. Both comparison and merging operations can
50 ;; be performed on directories, i.e., by pairwise comparison of files in those
51 ;; directories.
53 ;; In addition, Ediff can apply a patch to a file and then let you step
54 ;; though both files, the patched and the original one, simultaneously,
55 ;; difference-by-difference. You can even apply a patch right out of a
56 ;; mail buffer, i.e., patches received by mail don't even have to be saved.
57 ;; Since Ediff lets you copy differences between buffers, you can, in
58 ;; effect, apply patches selectively (i.e., you can copy a difference
59 ;; region from file_orig to file, thereby undoing any particular patch that
60 ;; you don't like).
62 ;; Ediff is aware of version control, which lets the user compare
63 ;; files with their older versions. Ediff can also work with remote and
64 ;; compressed files. Details are given below.
66 ;; Finally, Ediff supports directory-level comparison, merging and patching.
67 ;; See the on-line manual for details.
69 ;; This package builds upon the ideas borrowed from emerge.el and several
70 ;; Ediff's functions are adaptations from emerge.el. Much of the functionality
71 ;; Ediff provides is also influenced by emerge.el.
73 ;; The present version of Ediff supersedes Emerge. It provides a superior user
74 ;; interface and has numerous major features not found in Emerge. In
75 ;; particular, it can do patching, and 2-way and 3-way file comparison,
76 ;; merging, and directory operations.
80 ;;; Bugs:
82 ;; 1. The undo command doesn't restore deleted regions well. That is, if
83 ;; you delete all characters in a difference region and then invoke
84 ;; `undo', the reinstated text will most likely be inserted outside of
85 ;; what Ediff thinks is the current difference region. (This problem
86 ;; doesn't seem to exist with XEmacs.)
87 ;;
88 ;; If at any point you feel that difference regions are no longer correct,
89 ;; you can hit '!' to recompute the differences.
91 ;; 2. On a monochrome display, the repertoire of faces with which to
92 ;; highlight fine differences is limited. By default, Ediff is using
93 ;; underlining. However, if the region is already underlined by some other
94 ;; overlays, there is no simple way to temporarily remove that residual
95 ;; underlining. This problem occurs when a buffer is highlighted with
96 ;; hilit19.el or font-lock.el packages. If this residual highlighting gets
97 ;; in the way, you can do the following. Both font-lock.el and hilit19.el
98 ;; provide commands for unhighlighting buffers. You can either place these
99 ;; commands in `ediff-prepare-buffer-hook' (which will unhighlight every
100 ;; buffer used by Ediff) or you can execute them interactively, at any time
101 ;; and on any buffer.
104 ;;; Acknowledgements:
106 ;; Ediff was inspired by Dale R. Worley's <drw@math.mit.edu> emerge.el.
107 ;; Ediff would not have been possible without the help and encouragement of
108 ;; its many users. See Ediff on-line Info for the full list of those who
109 ;; helped. Improved defaults in Ediff file-name reading commands.
111 ;;; Code:
115 ;; Compiler pacifier
124 ;; end pacifier
130 "A comprehensive visual interface to diff & patch."
136 "If t, Ediff will use previous directory as default when reading file name."
140 ;; Last directory used by an Ediff command for file-A.
142 ;; Last directory used by an Ediff command for file-B.
144 ;; Last directory used by an Ediff command for file-C.
146 ;; Last directory used by an Ediff command for the ancestor file.
148 ;; Last directory used by an Ediff command as the output directory for merge.
152 ;; Used as a startup hook to set `_orig' patch file read-only.
157 ;; Return a plausible default for ediff's first file:
158 ;; In dired, return the file number FILENO (or 0) in the list
159 ;; (all-selected-files, filename under the cursor), where directories are
160 ;; ignored. Otherwise, return DEFAULT file name, if non-nil. Else,
161 ;; if the buffer is visiting a file, return that file name.
168 aux-list choices result)
177 default)))
181 ))
183 ;;; Compare files/buffers
185 ;;;###autoload
187 "Run Ediff on a pair of files, FILE-A and FILE-B."
190 ediff-last-dir-A
191 default-directory))
192 dir-B f)
194 "File A to compare"
195 dir-A
201 ediff-last-dir-B
205 'file-name-history
209 dir-B)))
211 )))
216 file-B)
217 nil ; file-C
218 startup-hooks
221 ;;;###autoload
223 "Run Ediff on three files, FILE-A, FILE-B, and FILE-C."
226 ediff-last-dir-A
227 default-directory))
228 dir-B dir-C f ff)
230 "File A to compare"
231 dir-A
237 ediff-last-dir-B
241 'file-name-history
245 dir-B)))
249 ediff-last-dir-C
253 'file-name-history
257 dir-C)))
259 )))
264 file-B)
268 file-C)
269 startup-hooks
272 ;;;###autoload
277 "Visit FILE and arrange its buffer to Ediff's liking.
278 FILE-VAR is actually a variable symbol whose value must contain a true
279 file name.
280 BUFFER-NAME is a variable symbol, which will get the buffer object into
281 which FILE is read.
282 LAST-DIR is the directory variable symbol where FILE's
283 directory name should be returned. HOOKS-VAR is a variable symbol that will
284 be assigned the hook to be executed after `ediff-startup' is finished.
285 `ediff-find-file' arranges that the temp files it might create will be
286 deleted."
295 ;; some of the commands, below, require full file name
298 ;; Record the directory of the file
302 ;; Setup the buffer
308 ;;; ange-ftp-hook-function--arrange for temp file
315 ;; file processed via auto-mode-alist, a la uncompress.el
327 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
337 ;;(sit-for 0)
340 ;;(sit-for 0)
345 ;;(sit-for 0)
352 buf-B file-B
353 buf-C file-C
354 startup-hooks
356 merge-buffer-file)))
360 ;;;###autoload
363 ;;;###autoload
365 "Run Ediff on FILE and its backup file.
366 Uses the latest backup, if there are several numerical backups.
367 If this file is a backup, `ediff' it with its original."
369 ;; The code is taken from `diff-backup'.
377 ori file))
380 ;;;###autoload
382 "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B."
389 ;; realign buffers so that two visible bufs will be
390 ;; at the top
393 t))))
397 ;;;###autoload
401 ;;;###autoload
404 "Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C."
411 ;; realign buffers so that two visible
412 ;; bufs will be at the top
415 t))
418 ;; realign buffers so that three visible
419 ;; bufs will be at the top
422 t)
423 )))
427 ;;;###autoload
432 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
440 file-A file-B file-C)
464 file-C
469 startup-hooks)
471 merge-buffer-file)))
474 ;;; Directory and file group operations
476 ;; Get appropriate default name for directory:
477 ;; If ediff-use-last-dir, use ediff-last-dir-A.
478 ;; In dired mode, use the directory that is under the point (if any);
479 ;; otherwise, use default-directory
485 f
486 default-directory)))
490 ;;;###autoload
492 "Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
493 the same name in both. The third argument, REGEXP, is nil or a regular
494 expression; only file names that match the regexp are considered."
498 f)
503 ediff-last-dir-B
509 default-regexp)
511 nil
512 'ediff-filtering-regexp-history
514 )))
517 ))
519 ;;;###autoload
523 ;;;###autoload
525 "Run Ediff on a directory, DIR1, comparing its files with their revisions.
526 The second argument, REGEXP, is a regular expression that filters the file
527 names. Only the files that are under revision control are taken into account."
531 )
537 default-regexp)
539 nil
540 'ediff-filtering-regexp-history
542 )))
545 ))
547 ;;;###autoload
551 ;;;###autoload
553 "Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
554 have the same name in all three. The last argument, REGEXP, is nil or a
555 regular expression; only file names that match the regexp are considered."
560 f)
564 ediff-last-dir-B
569 ediff-last-dir-C
575 default-regexp)
577 nil
578 'ediff-filtering-regexp-history
580 )))
583 ))
585 ;;;###autoload
588 ;;;###autoload
590 "Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
591 the same name in both. The third argument, REGEXP, is nil or a regular
592 expression; only file names that match the regexp are considered."
596 f)
601 ediff-last-dir-B
607 default-regexp)
609 nil
610 'ediff-filtering-regexp-history
612 )))
615 nil merge-autostore-dir
616 ))
618 ;;;###autoload
621 ;;;###autoload
623 &optional
624 merge-autostore-dir)
625 "Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
626 Ediff merges files that have identical names in DIR1, DIR2. If a pair of files
627 in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
628 without ancestor. The fourth argument, REGEXP, is nil or a regular expression;
629 only file names that match the regexp are considered."
633 f)
637 ediff-last-dir-B
642 ediff-last-dir-C
648 default-regexp)
650 nil
651 'ediff-filtering-regexp-history
653 )))
655 dir1 dir2 ancestor-dir regexp
657 nil merge-autostore-dir
658 ))
660 ;;;###autoload
663 "Run Ediff on a directory, DIR1, merging its files with their revisions.
664 The second argument, REGEXP, is a regular expression that filters the file
665 names. Only the files that are under revision control are taken into account."
669 )
675 default-regexp)
677 nil
678 'ediff-filtering-regexp-history
680 )))
683 nil merge-autostore-dir
684 ))
686 ;;;###autoload
689 ;;;###autoload
691 &optional
692 merge-autostore-dir)
693 "Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors.
694 The second argument, REGEXP, is a regular expression that filters the file
695 names. Only the files that are under revision control are taken into account."
699 )
701 "Directory to merge with revisions and ancestors:"
706 default-regexp)
708 nil
709 'ediff-filtering-regexp-history
711 )))
713 dir1 regexp 'ediff-merge-revisions-with-ancestor
714 'ediff-merge-directory-revisions-with-ancestor
715 nil merge-autostore-dir
716 ))
718 ;;;###autoload
720 'edir-merge-revisions-with-ancestor
723 ;;;###autoload
726 ;; Run ediff-action (ediff-files, ediff-merge, ediff-merge-with-ancestors)
727 ;; on a pair of directories (three directories, in case of ancestor).
728 ;; The third argument, REGEXP, is nil or a regular expression;
729 ;; only file names that match the regexp are considered.
730 ;; JOBNAME is the symbol indicating the meta-job to be performed.
731 ;; MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
733 &optional startup-hooks
734 merge-autostore-dir)
750 jobname)))
752 ;; It is a structure where ediff-intersect-directories returns
753 ;; commonalities and differences among directories
754 dir-diff-struct
755 meta-buf)
762 ediff-last-merge-autostore-dir
764 nil
766 ;; verify we are not merging into an orig directory
782 jobname
783 regexp dir1 dir2 dir3 merge-autostore-dir))
785 ;; this sets various vars in the meta buffer inside
786 ;; ediff-prepare-meta-buffer
788 ;; tell what to do if the user clicks on a session record
790 ;; set ediff-dir-difference-list
793 startup-hooks))
795 'ediff-filegroup-action
797 "*Ediff Session Group Panel"
798 'ediff-redraw-directory-group-buffer
799 jobname
800 startup-hooks))
802 ))
804 ;; MERGE-AUTOSTORE-DIR can be given to tell ediff where to store the merged
805 ;; files
807 &optional startup-hooks
808 merge-autostore-dir)
814 jobname)))
822 ediff-last-merge-autostore-dir
824 nil
826 ;; verify merge-autostore-dir != dir1
836 jobname regexp dir1 merge-autostore-dir))
838 ;; this sets various vars in the meta buffer inside
839 ;; ediff-prepare-meta-buffer
841 ;; tell what to do if the user clicks on a session record
843 startup-hooks))
845 'ediff-filegroup-action
846 file-list
847 "*Ediff Session Group Panel"
848 'ediff-redraw-directory-group-buffer
849 jobname
850 startup-hooks))
852 ))
855 ;;; Compare regions and windows
857 ;;;###autoload
859 "Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
860 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
861 follows:
862 If WIND-A is nil, use selected window.
863 If WIND-B is nil, use window next to WIND-A."
868 ;;;###autoload
870 "Compare WIND-A and WIND-B, which are selected by clicking, linewise.
871 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
872 follows:
873 If WIND-A is nil, use selected window.
874 If WIND-B is nil, use window next to WIND-A."
879 ;; Compare WIND-A and WIND-B, which are selected by clicking.
880 ;; With prefix argument, DUMB-MODE, or on a non-windowing display,
881 ;; works as follows:
882 ;; If WIND-A is nil, use selected window.
883 ;; If WIND-B is nil, use window next to WIND-A.
893 beg-A end-A beg-B end-B)
907 buffer-B
911 buffer-A beg-A end-A buffer-B beg-B end-B
912 startup-hooks job-name word-mode nil)))
915 ;;;###autoload
917 "Run Ediff on a pair of regions in specified buffers.
918 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
919 This function is effective only for relatively small regions, up to 200
920 lines. For large regions, use `ediff-regions-linewise'."
927 ;; realign buffers so that two visible bufs will be
928 ;; at the top
931 t))))
942 reg-A-beg reg-A-end reg-B-beg reg-B-end)
956 ;;;###autoload
958 "Run Ediff on a pair of regions in specified buffers.
959 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
960 Each region is enlarged to contain full lines.
961 This function is effective for large regions, over 100-200
962 lines. For small regions, use `ediff-regions-wordwise'."
969 ;; realign buffers so that two visible bufs will be
970 ;; at the top
973 t))))
983 reg-A-beg reg-A-end reg-B-beg reg-B-end)
988 ;; enlarge the region to hold full lines
1000 ;; enlarge the region to hold full lines
1015 ;; compare region beg-A to end-A of buffer-A
1016 ;; to regions beg-B -- end-B in buffer-B.
1018 startup-hooks job-name word-mode
1019 setup-parameters)
1021 overl-A overl-B
1022 file-A file-B)
1024 ;; in case beg/end-A/B aren't markers--make them into markers
1032 ;; make file-A
1038 ;; make file-B
1047 buffer-B file-B
1048 nil nil ; buffer & file C
1052 startup-hooks)
1057 setup-parameters))
1058 ))
1061 ;;; Merge files and buffers
1063 ;;;###autoload
1068 ;; Can't remember why this is here, but it may cause the automatically merged
1069 ;; buffer to be lost. So, keep the buffer modified.
1070 ;;(ediff-with-current-buffer ediff-buffer-C
1071 ;; (set-buffer-modified-p nil))
1072 )
1074 ;;;###autoload
1076 ;; MERGE-BUFFER-FILE is the file to be
1077 ;; associated with the merge buffer
1079 "Merge two files without ancestor."
1082 ediff-last-dir-A
1083 default-directory))
1084 dir-B f)
1086 "File A to merge"
1087 dir-A
1093 ediff-last-dir-B
1097 'file-name-history
1101 dir-B)))
1103 )))
1109 file-B)
1110 nil ; file-C
1111 startup-hooks
1112 'ediff-merge-files
1113 merge-buffer-file))
1115 ;;;###autoload
1117 &optional
1118 startup-hooks
1119 ;; MERGE-BUFFER-FILE is the file
1120 ;; to be associated with the
1121 ;; merge buffer
1122 merge-buffer-file)
1123 "Merge two files with ancestor."
1126 ediff-last-dir-A
1127 default-directory))
1128 dir-B dir-ancestor f ff)
1130 "File A to merge"
1131 dir-A
1137 ediff-last-dir-B
1141 'file-name-history
1145 dir-B)))
1150 ediff-last-dir-ancestor
1154 'file-name-history
1158 dir-ancestor)))
1160 )))
1166 file-B)
1167 file-ancestor
1168 startup-hooks
1169 'ediff-merge-files-with-ancestor
1170 merge-buffer-file))
1172 ;;;###autoload
1175 ;;;###autoload
1177 &optional
1178 ;; MERGE-BUFFER-FILE is the file to be
1179 ;; associated with the merge buffer
1180 startup-hooks job-name merge-buffer-file)
1181 "Merge buffers without ancestor."
1188 ;; realign buffers so that two visible bufs will be
1189 ;; at the top
1192 t))))
1197 buffer-A buffer-B nil startup-hooks job-name merge-buffer-file))
1199 ;;;###autoload
1201 &optional
1202 startup-hooks
1203 job-name
1204 ;; MERGE-BUFFER-FILE is the
1205 ;; file to be associated
1206 ;; with the merge buffer
1207 merge-buffer-file)
1208 "Merge buffers with ancestor."
1215 ;; realign buffers so that two visible
1216 ;; bufs will be at the top
1219 t))
1222 ;; realign buffers so that three visible
1223 ;; bufs will be at the top
1226 t)
1227 )))
1232 buffer-A buffer-B buffer-ancestor startup-hooks job-name merge-buffer-file))
1235 ;;;###autoload
1237 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
1238 "Run Ediff by merging two revisions of a file.
1239 The file is the optional FILE argument or the file visited by the current
1240 buffer."
1247 "Version 1 to merge (default %s's working version): "
1250 rev2
1253 "Version 2 to merge (default %s): "
1257 ;; ancestor-revision=nil
1260 rev1 rev2 nil startup-hooks merge-buffer-file)))
1263 ;;;###autoload
1265 file startup-hooks
1266 ;; MERGE-BUFFER-FILE is the file to
1267 ;; be associated with the merge
1268 ;; buffer
1269 merge-buffer-file)
1270 "Run Ediff by merging two revisions of a file with a common ancestor.
1271 The file is the optional FILE argument or the file visited by the current
1272 buffer."
1279 "Version 1 to merge (default %s's working version): "
1282 rev2
1285 "Version 2 to merge (default %s): "
1288 ancestor-rev
1291 "Ancestor version (default %s's base revision): "
1297 rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
1299 ;;; Apply patch
1301 ;;;###autoload
1303 "Run Ediff by patching SOURCE-FILENAME.
1304 If optional PATCH-BUF is given, use the patch in that buffer
1305 and don't ask the user.
1306 If prefix argument, then: if even argument, assume that the patch is in a
1307 buffer. If odd -- assume it is in a file."
1323 "File to patch (directory, if multifile patch): "
1324 ;; use an explicit initial file
1328 ;;;###autoload
1330 "Run Ediff by patching the buffer specified at prompt.
1331 Without the optional prefix ARG, asks if the patch is in some buffer and
1332 prompts for the buffer or a file, depending on the answer.
1333 With ARG=1, assumes the patch is in a file and prompts for the file.
1334 With ARG=2, assumes the patch is in a buffer and prompts for the buffer.
1335 PATCH-BUF is an optional argument, which specifies the buffer that contains the
1336 patch. If not given, the user is prompted according to the prefix argument."
1343 patch-buf
1345 "Which buffer to patch? "
1349 ;;;###autoload
1351 ;;;###autoload
1356 \f
1357 ;;; Versions Control functions
1359 ;;;###autoload
1361 "Run Ediff by comparing versions of a file.
1362 The file is an optional FILE argument or the file entered at the prompt.
1363 Default: the file visited by the current buffer.
1364 Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'."
1365 ;; if buffer is non-nil, use that buffer instead of the current buffer
1371 ediff-last-dir-A
1372 default-directory)
1385 rev2
1392 rev1 rev2 startup-hooks)
1393 ))
1396 ;;;###autoload
1400 ;; Test if version control package is loaded and load if not
1401 ;; Is SILENT is non-nil, don't report error if package is not found.
1411 ediff-version-control-package)))))
1414 ;;;###autoload
1416 "Return string describing the version of Ediff.
1417 When called interactively, displays the version."
1423 ;; info is run first, and will autoload info.el.
1426 ;;;###autoload
1428 "Display Ediff's manual.
1429 With optional NODE, goes to that node."
1455 "^Hmm... I don't see an Ediff command around here...$"
1456 "^Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer$"
1457 ": This command runs in Ediff Control Buffer only!$"
1458 ": Invalid op in ediff-check-version$"
1459 "^ediff-shrink-window-C can be used only for merging jobs$"
1460 "^Lost difference info on these directories$"
1461 "^This command is inapplicable in the present context$"
1462 "^This session group has no parent$"
1463 "^Can't hide active session, $"
1464 "^Ediff: something wrong--no multiple diffs buffer$"
1465 "^Can't make context diff for Session $"
1466 "^The patch buffer wasn't found$"
1467 "^Aborted$"
1468 "^This Ediff session is not part of a session group$"
1469 "^No active Ediff sessions or corrupted session registry$"
1470 "^No session info in this line$"
1471 "^`.*' is not an ordinary file$"
1472 "^Patch appears to have failed$"
1473 "^Recomputation of differences cancelled$"
1474 "^No fine differences in this mode$"
1475 "^Lost connection to ancestor buffer...sorry$"
1476 "^Not merging with ancestor$"
1477 "^Don't know how to toggle read-only in buffer "
1478 "Emacs is not running as a window application$"
1479 "^This command makes sense only when merging with an ancestor$"
1480 "^At end of the difference list$"
1481 "^At beginning of the difference list$"
1482 "^Nothing saved for diff .* in buffer "
1483 "^Buffer is out of sync for file "
1484 "^Buffer out of sync for file "
1485 "^Output from `diff' not found$"
1486 "^You forgot to specify a region in buffer "
1487 "^All right. Make up your mind and come back...$"
1488 "^Current buffer is not visiting any file$"
1489 "^Failed to retrieve revision: $"
1490 "^Can't determine display width.$"
1491 "^File `.*' does not exist or is not readable$"
1492 "^File `.*' is a directory$"
1493 "^Buffer .* doesn't exist$"
1494 "^Directories . and . are the same: "
1495 "^Directory merge aborted$"
1496 "^Merge of directory revisions aborted$"
1497 "^Buffer .* doesn't exist$"
1498 "^There is no file to merge$"
1508 ;; Local Variables:
1509 ;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1510 ;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
1511 ;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
1512 ;; End:
1514 ;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc
1515 ;;; ediff.el ends here