| commit | afc5f2ce63be2a51b1f87467065e47c398468c9e | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 May 2017 02:51:59 +0000 (16 11:51 +0900) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 16 May 2017 02:51:59 +0000 (16 11:51 +0900) | ||
| tree | 5965af2e5aba72677949a6bde615a0934bf290b1 | treesnapshot (tar.gz zip) |
| parent | 5cea6ffdf20b99388821fa1bc279da06835f5a0c | commitdiff |
| parent | e294e8959fea043225a023f981121540b14b08cd | commitdiff |
Merge branch 'jc/apply-fix-mismerge'
* jc/apply-fix-mismerge:
apply.c: fix whitespace-only mismerge
* jc/apply-fix-mismerge:
apply.c: fix whitespace-only mismerge
| apply.c | diff1 | diff2 | blobhistory |