Merge branch 'jc/apply-fix-mismerge'

Browse Source

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

...

This commit is contained in:

Junio C Hamano

2017-05-16 11:51:59 +09:00

parent 5cea6ffdf2 e294e8959f

commit afc5f2ce63

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