Mercurial > emacs

comparison lisp/ediff-merg.el @ 13129:9d432c26c3a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
*** empty log message ***
author Michael Kifer <kifer@cs.stonybrook.edu>
date Fri, 06 Oct 1995 00:56:53 +0000
parents 87f8b79217b3
children b9dc8cc658d5
comparison
equal deleted inserted replaced
13128:b0ec8d932b35 13129:9d432c26c3a7
88 88
89 (defun ediff-set-merge-mode () 89 (defun ediff-set-merge-mode ()
90 ;; by Stig@hackvan.com 90 ;; by Stig@hackvan.com
91 (normal-mode t) 91 (normal-mode t)
92 (remove-hook 'local-write-file-hooks 'ediff-set-merge-mode)) 92 (remove-hook 'local-write-file-hooks 'ediff-set-merge-mode))
93
93 94
94 ;; Go over all diffs starting with DIFF-NUM and copy regions into buffer C 95 ;; Go over all diffs starting with DIFF-NUM and copy regions into buffer C
95 ;; according to the state of the difference. 96 ;; according to the state of the difference.
96 ;; Since ediff-copy-diff refuses to copy identical diff regions, there is 97 ;; Since ediff-copy-diff refuses to copy identical diff regions, there is
97 ;; no need to optimize ediff-do-merge any further. 98 ;; no need to optimize ediff-do-merge any further.
111 (if remerging "Re-merging" "Merging") 112 (if remerging "Re-merging" "Merging")
112 n 113 n
113 ediff-number-of-differences)) 114 ediff-number-of-differences))
114 115
115 (setq state-of-merge (ediff-get-state-of-merge n)) 116 (setq state-of-merge (ediff-get-state-of-merge n))
116 (setq do-not-copy (string= state-of-merge default-state-of-merge))
117 117
118 (if remerging 118 (if remerging
119 (let ((reg-A (ediff-get-region-contents n 'A ediff-control-buffer)) 119 (let ((reg-A (ediff-get-region-contents n 'A ediff-control-buffer))
120 (reg-B (ediff-get-region-contents n 'B ediff-control-buffer)) 120 (reg-B (ediff-get-region-contents n 'B ediff-control-buffer))
121 (reg-C (ediff-get-region-contents n 'C ediff-control-buffer))) 121 (reg-C (ediff-get-region-contents n 'C ediff-control-buffer)))