mergetools / gvimdiff2on commit Merge branch 'os/rebase-runs-post-checkout-hook' (d94ade7)
   1. "$MERGE_TOOLS_DIR/vimdiff"