]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 0501b7e e294e89)
Merge branch 'jc/apply-fix-mismerge' into maint
authorJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:20:59 +0000 (10:20 +0900)
committerJunio C Hamano <gitster@pobox.com>
Sun, 4 Jun 2017 01:20:59 +0000 (10:20 +0900)
commit34a75ccb1dade147f404c0841c3f1ec777c0a97a
tree510b420cb094401461673c76cf4117cfa2f31b74tree | snapshot
parent0501b7e78564d11e87d228f7ffdbdb4b147145e3commit | diff
parente294e8959fea043225a023f981121540b14b08cdcommit | diff
Merge branch 'jc/apply-fix-mismerge' into maint

Mismerge fix.

* jc/apply-fix-mismerge:
  apply.c: fix whitespace-only mismerge
apply.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.