mergetools / gvimdiffon commit Merge branch 'nd/ls-tree-pathspec' (5700772)
   1. "$MERGE_TOOLS_DIR/vimdiff"