Andrew's git / gitweb.git / diff
?
Merge branch 'jc/apply-fix-mismerge'
authorJunio C Hamano <gitster@pobox.com>
Tue, 16 May 2017 02:51:59 +0000 (11:51 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 16 May 2017 02:51:59 +0000 (11:51 +0900)
* jc/apply-fix-mismerge:
apply.c: fix whitespace-only mismerge

1  2 
apply.c patch | diff1 | diff2 | blob | history
diff --cc apply.c
Simple merge