mergetools / gvimdiff3on commit Merge branch 'gr/rebase-i-drop-warn' (3a760ca)
   1. "$MERGE_TOOLS_DIR/vimdiff"