Merge branch '2.8'

Browse Source

"git merge -s ours 2.8" suggested by @moy, with only commits d72e825 + 507c932.
On next merge from 2.8 to master, these 2 commits won't be merged.

...

This commit is contained in:

plegall

2016-03-08 15:34:51 +01:00

parent 234c132a1f 507c932db9

commit f0ac27292e

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

Diff Content Not Available