git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0501b7e e294e89)
Merge branch 'jc/apply-fix-mismerge' into maint
authorJunio C Hamano <redacted>
Sun, 4 Jun 2017 01:20:59 +0000 (10:20 +0900)
committerJunio C Hamano <redacted>
Sun, 4 Jun 2017 01:20:59 +0000 (10:20 +0900)
Mismerge fix.

* 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
git clone https://git.99rst.org/PROJECT