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 /git-gui/lib | |
| parent | e2110c8d881eb61db581b6b9ddd9568f20cf24c7 (diff) | |
| parent | 55846b9abd128185388418e025651cfd6a299a0e (diff) | |
| download | git-ba0254cb32537b7a7e92854a51256475ee83cdda.tar.gz git-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 'git-gui/lib')
0 files changed, 0 insertions, 0 deletions