mergetools / gvimdiff2on commit Merge branch 'bw/pathspec-remove-unused-extern-decl' (570b449)
   1. "$MERGE_TOOLS_DIR/vimdiff"