mergetools / gvimdiffon commit Merge branch 'bw/attr-pathspec' (2f9dfb8)
   1. "$MERGE_TOOLS_DIR/vimdiff"