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