| blob | 42af9d82cbb9e4b66caf81acac1c8ae6850697a1 |
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 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
276 ;; Visit FILE and arrange its buffer to Ediff's liking.
277 ;; FILE is actually a variable symbol that must contain a true file name.
278 ;; BUFFER-NAME is a variable symbol, which will get the buffer object into
279 ;; which FILE is read.
280 ;; LAST-DIR is the directory variable symbol where FILE's
281 ;; directory name should be returned. HOOKS-VAR is a variable symbol that will
282 ;; be assigned the hook to be executed after `ediff-startup' is finished.
283 ;; `ediff-find-file' arranges that the temp files it might create will be
284 ;; deleted.
294 ;; some of the commands, below, require full file name
297 ;; Record the directory of the file
301 ;; Setup the buffer
307 ;;; ange-ftp-hook-function--arrange for temp file
314 ;; file processed via auto-mode-alist, a la uncompress.el
326 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
336 ;;(sit-for 0)
339 ;;(sit-for 0)
344 ;;(sit-for 0)
351 buf-B file-B
352 buf-C file-C
353 startup-hooks
355 merge-buffer-file)))
359 ;;;###autoload
362 ;;;###autoload
364 "Run Ediff on FILE and its backup file.
365 Uses the latest backup, if there are several numerical backups.
366 If this file is a backup, `ediff' it with its original."
368 ;; The code is taken from `diff-backup'.
376 ori file))
379 ;;;###autoload
381 "Run Ediff on a pair of buffers, BUFFER-A and BUFFER-B."
388 ;; realign buffers so that two visible bufs will be
389 ;; at the top
392 t))))
396 ;;;###autoload
400 ;;;###autoload
403 "Run Ediff on three buffers, BUFFER-A, BUFFER-B, and BUFFER-C."
410 ;; realign buffers so that two visible
411 ;; bufs will be at the top
414 t))
417 ;; realign buffers so that three visible
418 ;; bufs will be at the top
421 t)
422 )))
426 ;;;###autoload
431 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
439 file-A file-B file-C)
463 file-C
468 startup-hooks)
470 merge-buffer-file)))
473 ;;; Directory and file group operations
475 ;; Get appropriate default name for directory:
476 ;; If ediff-use-last-dir, use ediff-last-dir-A.
477 ;; In dired mode, use the directory that is under the point (if any);
478 ;; otherwise, use default-directory
484 f
485 default-directory)))
489 ;;;###autoload
491 "Run Ediff on a pair of directories, DIR1 and DIR2, comparing files that have
492 the same name in both. The third argument, REGEXP, is nil or a regular
493 expression; only file names that match the regexp are considered."
497 f)
502 ediff-last-dir-B
508 default-regexp)
510 nil
511 'ediff-filtering-regexp-history
513 )))
516 ))
518 ;;;###autoload
522 ;;;###autoload
524 "Run Ediff on a directory, DIR1, comparing its files with their revisions.
525 The second argument, REGEXP, is a regular expression that filters the file
526 names. Only the files that are under revision control are taken into account."
530 )
536 default-regexp)
538 nil
539 'ediff-filtering-regexp-history
541 )))
544 ))
546 ;;;###autoload
550 ;;;###autoload
552 "Run Ediff on three directories, DIR1, DIR2, and DIR3, comparing files that
553 have the same name in all three. The last argument, REGEXP, is nil or a
554 regular expression; only file names that match the regexp are considered."
559 f)
563 ediff-last-dir-B
568 ediff-last-dir-C
574 default-regexp)
576 nil
577 'ediff-filtering-regexp-history
579 )))
582 ))
584 ;;;###autoload
587 ;;;###autoload
589 "Run Ediff on a pair of directories, DIR1 and DIR2, merging files that have
590 the same name in both. The third argument, REGEXP, is nil or a regular
591 expression; only file names that match the regexp are considered."
595 f)
600 ediff-last-dir-B
606 default-regexp)
608 nil
609 'ediff-filtering-regexp-history
611 )))
614 nil merge-autostore-dir
615 ))
617 ;;;###autoload
620 ;;;###autoload
622 &optional
623 merge-autostore-dir)
624 "Merge files in directories DIR1 and DIR2 using files in ANCESTOR-DIR as ancestors.
625 Ediff merges files that have identical names in DIR1, DIR2. If a pair of files
626 in DIR1 and DIR2 doesn't have an ancestor in ANCESTOR-DIR, Ediff will merge
627 without ancestor. The fourth argument, REGEXP, is nil or a regular expression;
628 only file names that match the regexp are considered."
632 f)
636 ediff-last-dir-B
641 ediff-last-dir-C
647 default-regexp)
649 nil
650 'ediff-filtering-regexp-history
652 )))
654 dir1 dir2 ancestor-dir regexp
656 nil merge-autostore-dir
657 ))
659 ;;;###autoload
662 "Run Ediff on a directory, DIR1, merging its files with their revisions.
663 The second argument, REGEXP, is a regular expression that filters the file
664 names. Only the files that are under revision control are taken into account."
668 )
674 default-regexp)
676 nil
677 'ediff-filtering-regexp-history
679 )))
682 nil merge-autostore-dir
683 ))
685 ;;;###autoload
688 ;;;###autoload
690 &optional
691 merge-autostore-dir)
692 "Run Ediff on a directory, DIR1, merging its files with their revisions and ancestors.
693 The second argument, REGEXP, is a regular expression that filters the file
694 names. Only the files that are under revision control are taken into account."
698 )
700 "Directory to merge with revisions and ancestors:"
705 default-regexp)
707 nil
708 'ediff-filtering-regexp-history
710 )))
712 dir1 regexp 'ediff-merge-revisions-with-ancestor
713 'ediff-merge-directory-revisions-with-ancestor
714 nil merge-autostore-dir
715 ))
717 ;;;###autoload
719 'edir-merge-revisions-with-ancestor
722 ;;;###autoload
725 ;; Run ediff-action (ediff-files, ediff-merge, ediff-merge-with-ancestors)
726 ;; on a pair of directories (three directories, in case of ancestor).
727 ;; The third argument, REGEXP, is nil or a regular expression;
728 ;; only file names that match the regexp are considered.
729 ;; JOBNAME is the symbol indicating the meta-job to be performed.
730 ;; MERGE-AUTOSTORE-DIR is the directory in which to store merged files.
732 &optional startup-hooks
733 merge-autostore-dir)
749 jobname)))
751 ;; It is a structure where ediff-intersect-directories returns
752 ;; commonalities and differences among directories
753 dir-diff-struct
754 meta-buf)
761 ediff-last-merge-autostore-dir
763 nil
765 ;; verify we are not merging into an orig directory
781 jobname
782 regexp dir1 dir2 dir3 merge-autostore-dir))
784 ;; this sets various vars in the meta buffer inside
785 ;; ediff-prepare-meta-buffer
787 ;; tell what to do if the user clicks on a session record
789 ;; set ediff-dir-difference-list
792 startup-hooks))
794 'ediff-filegroup-action
796 "*Ediff Session Group Panel"
797 'ediff-redraw-directory-group-buffer
798 jobname
799 startup-hooks))
801 ))
803 ;; MERGE-AUTOSTORE-DIR can be given to tell ediff where to store the merged
804 ;; files
806 &optional startup-hooks
807 merge-autostore-dir)
813 jobname)))
821 ediff-last-merge-autostore-dir
823 nil
825 ;; verify merge-autostore-dir != dir1
835 jobname regexp dir1 merge-autostore-dir))
837 ;; this sets various vars in the meta buffer inside
838 ;; ediff-prepare-meta-buffer
840 ;; tell what to do if the user clicks on a session record
842 startup-hooks))
844 'ediff-filegroup-action
845 file-list
846 "*Ediff Session Group Panel"
847 'ediff-redraw-directory-group-buffer
848 jobname
849 startup-hooks))
851 ))
854 ;;; Compare regions and windows
856 ;;;###autoload
858 "Compare WIND-A and WIND-B, which are selected by clicking, wordwise.
859 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
860 follows:
861 If WIND-A is nil, use selected window.
862 If WIND-B is nil, use window next to WIND-A."
867 ;;;###autoload
869 "Compare WIND-A and WIND-B, which are selected by clicking, linewise.
870 With prefix argument, DUMB-MODE, or on a non-windowing display, works as
871 follows:
872 If WIND-A is nil, use selected window.
873 If WIND-B is nil, use window next to WIND-A."
878 ;; Compare WIND-A and WIND-B, which are selected by clicking.
879 ;; With prefix argument, DUMB-MODE, or on a non-windowing display,
880 ;; works as follows:
881 ;; If WIND-A is nil, use selected window.
882 ;; If WIND-B is nil, use window next to WIND-A.
892 beg-A end-A beg-B end-B)
906 buffer-B
910 buffer-A beg-A end-A buffer-B beg-B end-B
911 startup-hooks job-name word-mode nil)))
914 ;;;###autoload
916 "Run Ediff on a pair of regions in specified buffers.
917 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
918 This function is effective only for relatively small regions, up to 200
919 lines. For large regions, use `ediff-regions-linewise'."
926 ;; realign buffers so that two visible bufs will be
927 ;; at the top
930 t))))
941 reg-A-beg reg-A-end reg-B-beg reg-B-end)
955 ;;;###autoload
957 "Run Ediff on a pair of regions in specified buffers.
958 Regions \(i.e., point and mark\) can be set in advance or marked interactively.
959 Each region is enlarged to contain full lines.
960 This function is effective for large regions, over 100-200
961 lines. For small regions, use `ediff-regions-wordwise'."
968 ;; realign buffers so that two visible bufs will be
969 ;; at the top
972 t))))
982 reg-A-beg reg-A-end reg-B-beg reg-B-end)
987 ;; enlarge the region to hold full lines
999 ;; enlarge the region to hold full lines
1014 ;; compare region beg-A to end-A of buffer-A
1015 ;; to regions beg-B -- end-B in buffer-B.
1017 startup-hooks job-name word-mode
1018 setup-parameters)
1020 overl-A overl-B
1021 file-A file-B)
1023 ;; in case beg/end-A/B aren't markers--make them into markers
1031 ;; make file-A
1037 ;; make file-B
1046 buffer-B file-B
1047 nil nil ; buffer & file C
1051 startup-hooks)
1056 setup-parameters))
1057 ))
1060 ;;; Merge files and buffers
1062 ;;;###autoload
1067 ;; Can't remember why this is here, but it may cause the automatically merged
1068 ;; buffer to be lost. So, keep the buffer modified.
1069 ;;(ediff-with-current-buffer ediff-buffer-C
1070 ;; (set-buffer-modified-p nil))
1071 )
1073 ;;;###autoload
1075 ;; MERGE-BUFFER-FILE is the file to be
1076 ;; associated with the merge buffer
1078 "Merge two files without ancestor."
1081 ediff-last-dir-A
1082 default-directory))
1083 dir-B f)
1085 "File A to merge"
1086 dir-A
1092 ediff-last-dir-B
1096 'file-name-history
1100 dir-B)))
1102 )))
1108 file-B)
1109 nil ; file-C
1110 startup-hooks
1111 'ediff-merge-files
1112 merge-buffer-file))
1114 ;;;###autoload
1116 &optional
1117 startup-hooks
1118 ;; MERGE-BUFFER-FILE is the file
1119 ;; to be associated with the
1120 ;; merge buffer
1121 merge-buffer-file)
1122 "Merge two files with ancestor."
1125 ediff-last-dir-A
1126 default-directory))
1127 dir-B dir-ancestor f ff)
1129 "File A to merge"
1130 dir-A
1136 ediff-last-dir-B
1140 'file-name-history
1144 dir-B)))
1149 ediff-last-dir-ancestor
1153 'file-name-history
1157 dir-ancestor)))
1159 )))
1165 file-B)
1166 file-ancestor
1167 startup-hooks
1168 'ediff-merge-files-with-ancestor
1169 merge-buffer-file))
1171 ;;;###autoload
1174 ;;;###autoload
1176 &optional
1177 ;; MERGE-BUFFER-FILE is the file to be
1178 ;; associated with the merge buffer
1179 startup-hooks job-name merge-buffer-file)
1180 "Merge buffers without ancestor."
1187 ;; realign buffers so that two visible bufs will be
1188 ;; at the top
1191 t))))
1196 buffer-A buffer-B nil startup-hooks job-name merge-buffer-file))
1198 ;;;###autoload
1200 &optional
1201 startup-hooks
1202 job-name
1203 ;; MERGE-BUFFER-FILE is the
1204 ;; file to be associated
1205 ;; with the merge buffer
1206 merge-buffer-file)
1207 "Merge buffers with ancestor."
1214 ;; realign buffers so that two visible
1215 ;; bufs will be at the top
1218 t))
1221 ;; realign buffers so that three visible
1222 ;; bufs will be at the top
1225 t)
1226 )))
1231 buffer-A buffer-B buffer-ancestor startup-hooks job-name merge-buffer-file))
1234 ;;;###autoload
1236 ;; MERGE-BUFFER-FILE is the file to be associated with the merge buffer
1237 "Run Ediff by merging two revisions of a file.
1238 The file is the optional FILE argument or the file visited by the current
1239 buffer."
1246 "Version 1 to merge (default %s's working version): "
1249 rev2
1252 "Version 2 to merge (default %s): "
1256 ;; ancestor-revision=nil
1259 rev1 rev2 nil startup-hooks merge-buffer-file)))
1262 ;;;###autoload
1264 file startup-hooks
1265 ;; MERGE-BUFFER-FILE is the file to
1266 ;; be associated with the merge
1267 ;; buffer
1268 merge-buffer-file)
1269 "Run Ediff by merging two revisions of a file with a common ancestor.
1270 The file is the optional FILE argument or the file visited by the current
1271 buffer."
1278 "Version 1 to merge (default %s's working version): "
1281 rev2
1284 "Version 2 to merge (default %s): "
1287 ancestor-rev
1290 "Ancestor version (default %s's base revision): "
1296 rev1 rev2 ancestor-rev startup-hooks merge-buffer-file)))
1298 ;;; Apply patch
1300 ;;;###autoload
1302 "Run Ediff by patching SOURCE-FILENAME.
1303 If optional PATCH-BUF is given, use the patch in that buffer
1304 and don't ask the user.
1305 If prefix argument, then: if even argument, assume that the patch is in a
1306 buffer. If odd -- assume it is in a file."
1322 "File to patch (directory, if multifile patch): "
1323 ;; use an explicit initial file
1327 ;;;###autoload
1329 "Run Ediff by patching the buffer specified at prompt.
1330 Without the optional prefix ARG, asks if the patch is in some buffer and
1331 prompts for the buffer or a file, depending on the answer.
1332 With ARG=1, assumes the patch is in a file and prompts for the file.
1333 With ARG=2, assumes the patch is in a buffer and prompts for the buffer.
1334 PATCH-BUF is an optional argument, which specifies the buffer that contains the
1335 patch. If not given, the user is prompted according to the prefix argument."
1342 patch-buf
1344 "Which buffer to patch? "
1348 ;;;###autoload
1350 ;;;###autoload
1355 \f
1356 ;;; Versions Control functions
1358 ;;;###autoload
1360 "Run Ediff by comparing versions of a file.
1361 The file is an optional FILE argument or the file entered at the prompt.
1362 Default: the file visited by the current buffer.
1363 Uses `vc.el' or `rcs.el' depending on `ediff-version-control-package'."
1364 ;; if buffer is non-nil, use that buffer instead of the current buffer
1370 ediff-last-dir-A
1371 default-directory)
1384 rev2
1391 rev1 rev2 startup-hooks)
1392 ))
1395 ;;;###autoload
1399 ;; Test if version control package is loaded and load if not
1400 ;; Is SILENT is non-nil, don't report error if package is not found.
1410 ediff-version-control-package)))))
1413 ;;;###autoload
1415 "Return string describing the version of Ediff.
1416 When called interactively, displays the version."
1422 ;; info is run first, and will autoload info.el.
1425 ;;;###autoload
1427 "Display Ediff's manual.
1428 With optional NODE, goes to that node."
1454 "^Hmm... I don't see an Ediff command around here...$"
1455 "^Undocumented command! Type `G' in Ediff Control Panel to drop a note to the Ediff maintainer$"
1456 ": This command runs in Ediff Control Buffer only!$"
1457 ": Invalid op in ediff-check-version$"
1458 "^ediff-shrink-window-C can be used only for merging jobs$"
1459 "^Lost difference info on these directories$"
1460 "^This command is inapplicable in the present context$"
1461 "^This session group has no parent$"
1462 "^Can't hide active session, $"
1463 "^Ediff: something wrong--no multiple diffs buffer$"
1464 "^Can't make context diff for Session $"
1465 "^The patch buffer wasn't found$"
1466 "^Aborted$"
1467 "^This Ediff session is not part of a session group$"
1468 "^No active Ediff sessions or corrupted session registry$"
1469 "^No session info in this line$"
1470 "^`.*' is not an ordinary file$"
1471 "^Patch appears to have failed$"
1472 "^Recomputation of differences cancelled$"
1473 "^No fine differences in this mode$"
1474 "^Lost connection to ancestor buffer...sorry$"
1475 "^Not merging with ancestor$"
1476 "^Don't know how to toggle read-only in buffer "
1477 "Emacs is not running as a window application$"
1478 "^This command makes sense only when merging with an ancestor$"
1479 "^At end of the difference list$"
1480 "^At beginning of the difference list$"
1481 "^Nothing saved for diff .* in buffer "
1482 "^Buffer is out of sync for file "
1483 "^Buffer out of sync for file "
1484 "^Output from `diff' not found$"
1485 "^You forgot to specify a region in buffer "
1486 "^All right. Make up your mind and come back...$"
1487 "^Current buffer is not visiting any file$"
1488 "^Failed to retrieve revision: $"
1489 "^Can't determine display width.$"
1490 "^File `.*' does not exist or is not readable$"
1491 "^File `.*' is a directory$"
1492 "^Buffer .* doesn't exist$"
1493 "^Directories . and . are the same: "
1494 "^Directory merge aborted$"
1495 "^Merge of directory revisions aborted$"
1496 "^Buffer .* doesn't exist$"
1497 "^There is no file to merge$"
1507 ;;; Local Variables:
1508 ;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)
1509 ;;; eval: (put 'ediff-with-current-buffer 'lisp-indent-hook 1)
1510 ;;; eval: (put 'ediff-with-current-buffer 'edebug-form-spec '(form body))
1511 ;;; End:
1513 ;; arch-tag: 97c71396-db02-4f41-8b48-6a51c3348fcc
1514 ;;; ediff.el ends here