mergetools / gvimdiff3on commit Merge branch 'dl/rebase-i-keep-base' (640f9cd)
   1. "$MERGE_TOOLS_DIR/vimdiff"