mergetools / gvimdiff3on commit Merge branch 'sg/rebase-progress' (6624e07)
   1. "$MERGE_TOOLS_DIR/vimdiff"