diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-12-02 11:26:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-12-02 11:26:40 -0800 |
| commit | a49e9af4939c1223020db7915ee612d836c1bcdc (patch) | |
| tree | 51285aad2c6a4942b85542df0a07d658d69ef6df /builtin/notes.c | |
| parent | Merge branch 'ks/no-textconv-symlink' into maint (diff) | |
| parent | merge-file: correctly find files when called in subdir (diff) | |
| download | git-a49e9af4939c1223020db7915ee612d836c1bcdc.tar.gz git-a49e9af4939c1223020db7915ee612d836c1bcdc.zip | |
Merge branch 'tr/maint-merge-file-subdir' into maint
* 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 'builtin/notes.c')
0 files changed, 0 insertions, 0 deletions