mergetools / gvimdiff2on commit Merge branch 'pw/rebase-abort-clean-rewritten' (88f95e4)
   1. "$MERGE_TOOLS_DIR/vimdiff"