Merge branch 'jc/apply-fix-mismerge' into maint

Browse Source

Mismerge fix.

* jc/apply-fix-mismerge:
  apply.c: fix whitespace-only mismerge

...

This commit is contained in:

Junio C Hamano

2017-06-04 10:20:59 +09:00

parent 0501b7e785 e294e8959f

commit 34a75ccb1d

1 changed files with 156 additions and 156 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files