mergetools / gvimdiffon commit Merge branch 'kb/co-orphan-suggestion-short-sha1' (bd1184c)
   1. "$MERGE_TOOLS_DIR/vimdiff"