![]() As similar as we had with git, we set up window layout accordingly. The order of arguments sending in from p4 resolve stated here which are base, theirs, yours, and merged file. Vimdiff -c "wincmd J" -c "windo set wrap" `wslpath $4` `wslpath $3` `wslpath $1` `wslpath $2` ![]() # Perforce sends arguments in order of base, theirs, yours, and resulting merge file. # this is to allow us to convert input Windows path to Linux path as sent in by sudo touch /usr/local/bin/p4merge_windowspath. ![]() Here we specify shell/bash script to intercept the arguments as same as we did for git. This is a Windows specific way to set environment variable via registry for merge program to be used.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |