mergetools / gvimdiff2on commit Merge branch 'nd/attr-pathspec-fix' (faadedb)
   1. "$MERGE_TOOLS_DIR/vimdiff"