mergetools / gvimdiff2on commit Merge branch 'gb/rebase-signoff' (768c7cb)
   1. "$MERGE_TOOLS_DIR/vimdiff"