Change 2215

jonathan_kamens (Jonathan Kamens)
Jonathan Kamens committed this change into //guest/jonathan_kamens/vc-p4
Request Review
Download .zip
Fix a bug in the logic for determining whether to use smerge-ediff or
backend-specific conflict resolution.
1 edited 0 added 0 deleted
Tip: Use n and p to cycle through the changes.