mergetools / vimdiff2on commit Merge branch 'pw/rebase-signoff' (850e925)
   1. "$MERGE_TOOLS_DIR/vimdiff"