mergetools / gvimdiff3on commit Merge branch 'pb/trim-trailing-spaces' (35869f4)
   1. "$MERGE_TOOLS_DIR/vimdiff"