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
精彩评论