mergetools / gvimdiffon commit Merge branch 'kw/rebase-progress' (ad7d3c3)
   1. "$MERGE_TOOLS_DIR/vimdiff"