michaelp0730
7/27/2016 - 4:20 PM

GitConfigMergeTool

p4merge.cmd "C:\Program Files\Perforce\p4merge.exe" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
p4mergetool.cmd \