mergetools / gvimdiff2on commit Merge branch 'bw/repo-object' (85ce4a6)
   1. "$MERGE_TOOLS_DIR/vimdiff"