mergetools / gvimdiff3on commit Merge branch 'mm/complete-rebase-autostash' (1e7ef5d)
   1. "$MERGE_TOOLS_DIR/vimdiff"