Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'jc/apply-fix-mismerge' into maint
author
Junio C Hamano
<gitster@pobox.com>
Sun, 4 Jun 2017 01:20:59 +0000
(10:20 +0900)
committer
Junio C Hamano
<gitster@pobox.com>
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
raw
|
combined
(merge:
0501b7e
e294e89
)
diff --cc
apply.c
Simple merge