diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-01-07 13:27:56 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-01-07 13:27:56 -0800 |
| commit | 3c84ac86fc896c108b789b8eb26b169cc0e8088a (patch) | |
| tree | 647250e896ab9c29d8c4b3867aae4a5ee7d15822 /builtin/merge-file.c | |
| parent | Git 2.1.4 (diff) | |
| parent | Merge branch 'maint-1.9' into maint-2.0 (diff) | |
| download | tgif-3c84ac86fc896c108b789b8eb26b169cc0e8088a.tar.xz | |
Merge branch 'maint-2.0' into maint-2.1
* maint-2.0:
is_hfs_dotgit: loosen over-eager match of \u{..47}
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions