Commit graph

5 commits

Author SHA1 Message Date
Jonathan Kamens
bf07af865c Set ediff-default-variant even when doing merges with an ancestor.
[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1218]
2002-01-06 04:39:26 -08:00
Jonathan Kamens
96df41611e Fix a parenthesization error in the code for repairing some vc.el
functions.

[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1216]
2002-01-05 22:13:56 -08:00
Jonathan Kamens
d128cfaad4 Fix a minor working error in a comment.
[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1215]
2002-01-05 20:23:05 -08:00
Jonathan Kamens
5206f5e427 Add comments telling people where these files can be retrieved
from.

[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1214]
2002-01-05 19:55:28 -08:00
Jonathan Kamens
b69b02ad08 Initial version of Emacs 21 VC support for Perforce.
[git-p4: depot-paths = "//guest/Ben_Key/vc-p4/,//guest/jonathan_kamens/vc-p4/,//guest/magnus_henoch/vc-p4/": change = 1213]
2002-01-05 19:45:11 -08:00