mergetools / gvimdiff3on commit Merge branch 'so/rebase-doc-fork-point' (792a572)
   1. "$MERGE_TOOLS_DIR/vimdiff"