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