Fork of Jonathan Kamens', Magnus Henoch's and Ben Key's p4-vc.el

Jonathan Kamens 435d183a4c Fix a bug in the logic for determining whether to use smerge-ediff or ... 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]		2002-10-06 09:38:27 -08:00
p4-lowlevel.el	Add comments telling people where these files can be retrieved	2002-01-05 19:55:28 -08:00
vc-p4.el	Fix a bug in the logic for determining whether to use smerge-ediff or	2002-10-06 09:38:27 -08:00