mergetools / gvimdiff2on commit Merge branch 'jk/describe-omit-some-refs' (a515136)
   1. "$MERGE_TOOLS_DIR/vimdiff"