diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:50 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-01-20 20:28:50 -0800 |
| commit | df91d0e4d30ddc9bf2c55e3a63be9cb5318a409a (patch) | |
| tree | 0de68b9b3ef9f2b0a72363af19fce18156d31537 /xdiff/xmerge.c | |
| parent | fcb2a7e4a3c7899a3432f5804889fa3ea5779220 (diff) | |
| parent | 158620872737067e4a74ca7aed5302af8debb714 (diff) | |
| download | git-df91d0e4d30ddc9bf2c55e3a63be9cb5318a409a.tar.gz | |
Merge branch 'ag/maint-apply-too-large-p'
* ag/maint-apply-too-large-p:
builtin-apply.c: Skip filenames without enough components
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions