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

Fix a bug in the logic for determining whether to use smerge-ediff or

Browse source 
backend-specific conflict resolution.

[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 2215]
This commit is contained in:
Jonathan Kamens 2002-10-06 09:38:27 -08:00
parent ba127bdbfb
commit 435d183a4c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
vc-p4.el
View file

@ -200,8 +200,8 @@ visiting FILE."
(if (fboundp 'smerge-mode) (smerge-mode 1)) (if (fboundp 'smerge-mode) (smerge-mode 1))
(if (y-or-n-p "Conflicts detected. Resolve them now? ") (if (y-or-n-p "Conflicts detected. Resolve them now? ")
(if (and (fboundp 'smerge-ediff) (if (and (fboundp 'smerge-ediff)
(not (vc-find-backend-function (vc-backend file) (not (fboundp (vc-make-backend-sym (vc-backend file)
'resolve-select-yours))) 'resolve-select-yours))))
(smerge-ediff) (smerge-ediff)
(vc-resolve-conflicts name-A name-B)) (vc-resolve-conflicts name-A name-B))
(message "File contains conflict markers")))) (message "File contains conflict markers"))))