Is it possible to use vim as the default merge viewer for Delphi XE to resolve check-in conflicts?
If so, what parameters do I need to use in the tools->options->Merge Viewer dialog?
Share
Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
Is it possible to use vim as the default merge viewer for Delphi XE to resolve check-in conflicts?
If so, what parameters do I need to use in the tools->options->Merge Viewer dialog?
Yeah, it works. Put gvim in as the program, the working directory will automatically fill in.
Then use the following parameters:
-f -d -c "wincmd J" $(OutputFileName) $(MyFileName) $(BaseFileName) $(TheirFileName)source