mergetools / gvimdiffon commit Merge branch 'jk/warn-on-object-refname-ambiguity' (d4c6e9f)
   1. "$MERGE_TOOLS_DIR/vimdiff"