mergetools / gvimdiff3on commit Merge branch 'nd/gitignore-trailing-whitespace' into maint (7fa1365)
   1. "$MERGE_TOOLS_DIR/vimdiff"