Lines Matching refs:buf2
191 (let (buf1 buf2 ancestor-buf)
199 (setq buf2 (current-buffer)))
211 (ediff-delete-version-file ,(buffer-file-name buf2)))
219 buf1 buf2 ancestor-buf
222 buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))
229 (let (buf1 buf2 ancestor-buf)
232 buf2 (if (string= rev2 "")
243 buf1 buf2 ancestor-buf
246 buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))))
252 (let (buf1 buf2 ancestor-buf)
261 (setq buf2 (current-buffer)))
269 buf1 buf2 ancestor-buf
272 buf1 buf2 startup-hooks 'ediff-merge-revisions merge-buffer-file))))