diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-09 19:32:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-09 19:32:08 -0700 |
| commit | 7278a29a277750e9e3cccce3cfb751d6171b1a43 (patch) | |
| tree | d15df79e0893f45c099867a513e3969d5f9659c9 /t/lib-read-tree-m-3way.sh | |
| parent | Merge branch 'jc/grep' into next (diff) | |
| parent | Merge branch 'fix' (diff) | |
| download | tgif-7278a29a277750e9e3cccce3cfb751d6171b1a43.tar.xz | |
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
Diffstat (limited to 't/lib-read-tree-m-3way.sh')
0 files changed, 0 insertions, 0 deletions