ryuslash/vc-p4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Set ediff-default-variant even when doing merges with an ancestor.

Browse source 
[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1218]
This commit is contained in:
Jonathan Kamens 2002-01-06 04:39:26 -08:00
parent 96df41611e
commit bf07af865c
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
vc-p4.el
View file

@ -200,7 +200,8 @@ The conflicts must be marked with rcsmerge conflict markers."
(kill-buffer ancestor-buffer) (kill-buffer ancestor-buffer)
(setq ancestor-buffer nil))) (setq ancestor-buffer nil)))
(let ((config (current-window-configuration))) (let ((config (current-window-configuration))
(ediff-default-variant 'default-B))
;; Fire up ediff. ;; Fire up ediff.
@ -208,8 +209,7 @@ The conflicts must be marked with rcsmerge conflict markers."
(if ancestor-buffer (if ancestor-buffer
(ediff-merge-buffers-with-ancestor your-buffer other-buffer (ediff-merge-buffers-with-ancestor your-buffer other-buffer
ancestor-buffer) ancestor-buffer)
(let ((ediff-default-variant 'default-B)) (ediff-merge-buffers your-buffer other-buffer)))
(ediff-merge-buffers your-buffer other-buffer))))
;; Ediff is now set up, and we are in the control buffer. ;; Ediff is now set up, and we are in the control buffer.
;; Do a few further adjustments and take precautions for exit. ;; Do a few further adjustments and take precautions for exit.