diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:36 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-11-29 17:52:36 -0800 |
| commit | 208247adb9fc3702f87c6ec3fc26bd85d10d73e6 (patch) | |
| tree | 3b1a4d8e778d8733e9b70fd53e097d632d264040 /diffcore-pickaxe.c | |
| parent | Merge branch 'en/merge-recursive' (diff) | |
| parent | use persistent memory for rejected paths (diff) | |
| download | tgif-208247adb9fc3702f87c6ec3fc26bd85d10d73e6.tar.xz | |
Merge branch 'cb/leading-path-removal'
* cb/leading-path-removal:
use persistent memory for rejected paths
do not overwrite files in leading path
lstat_cache: optionally return match_len
add function check_ok_to_remove()
t7607: add leading-path tests
t7607: use test-lib functions and check MERGE_HEAD
Conflicts:
t/t7607-merge-overwrite.sh
Diffstat (limited to 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions