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

Fix a parenthesization error in the code for repairing some vc.el

Browse source 
functions.

[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1216]
This commit is contained in:
Jonathan Kamens 2002-01-05 22:13:56 -08:00
parent d128cfaad4
commit 96df41611e
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
vc-p4.el
View file

@ -112,7 +112,7 @@
;; return version of starting point ;; return version of starting point
(vc-branch-part branch))))))) (vc-branch-part branch)))))))
(if (not (fboundp 'vc-default-resolve-select-yours)) (if (fboundp 'vc-default-resolve-select-yours) t
(defun vc-maybe-resolve-conflicts (file status &optional name-A name-B) (defun vc-maybe-resolve-conflicts (file status &optional name-A name-B)
(vc-resynch-buffer file t (not (buffer-modified-p))) (vc-resynch-buffer file t (not (buffer-modified-p)))
(if (zerop status) (message "Merge successful") (if (zerop status) (message "Merge successful")