mergetools / gvimdiff2on commit Merge branch 'nd/branch-show-rebase-bisect-state' (afc2e81)
   1. "$MERGE_TOOLS_DIR/vimdiff"