Mercurial > hg > xemacs-beta

comparison lisp/ediff/ediff.el @ 2:ac2d302a0011 r19-15b2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r19-15b2
author cvs
date Mon, 13 Aug 2007 08:46:35 +0200
parents 376386a54a3c
children bcdc7deadc19
comparison
equal deleted inserted replaced
1:c0c6a60d29db 2:ac2d302a0011
1057 1057
1058 1058
1059 ;;;###autoload 1059 ;;;###autoload
1060 (defun ediff-merge-revisions-with-ancestor (&optional file startup-hooks) 1060 (defun ediff-merge-revisions-with-ancestor (&optional file startup-hooks)
1061 "Run Ediff by merging two revisions of a file with a common ancestor. 1061 "Run Ediff by merging two revisions of a file with a common ancestor.
1062 The file is the the optional FILE argument or the file visited by the current 1062 The file is the optional FILE argument or the file visited by the current
1063 buffer." 1063 buffer."
1064 (interactive) 1064 (interactive)
1065 (if (stringp file) (find-file file)) 1065 (if (stringp file) (find-file file))
1066 (let (rev1 rev2 ancestor-rev) 1066 (let (rev1 rev2 ancestor-rev)
1067 (setq rev1 1067 (setq rev1