diff options
author | Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:00:56 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2010-11-17 15:00:56 -0800 |
commit | ba0254cb32537b7a7e92854a51256475ee83cdda (patch) | |
tree | 6e8bcfa99201c20d8647600e74b78e580cfd23cf /ppc | |
parent | Merge branch 'jn/send-pack-error' (diff) | |
parent | merge-file: correctly find files when called in subdir (diff) | |
download | tgif-ba0254cb32537b7a7e92854a51256475ee83cdda.tar.xz |
Merge branch 'tr/maint-merge-file-subdir'
* tr/maint-merge-file-subdir:
merge-file: correctly find files when called in subdir
prefix_filename(): safely handle the case where pfx_len=0
Diffstat (limited to 'ppc')
0 files changed, 0 insertions, 0 deletions