Junio C Hamano 7278a29a27 Merge branch 'master' into next ...

* master:
  checkout: use --aggressive when running a 3-way merge (-m).
  revert/cherry-pick: use aggressive merge.
  read-cache.c: use xcalloc() not calloc()
  apply: fix infinite loop with multiple patches with --index

2006-05-09 19:32:08 -07:00

19 KiB

Raw Blame History

View Raw