Initial 'merge -s ours' from 0.66 release branch.

Browse Source

Everything up to here on the release branch is cherry-picks from
master anyway, and some of their cherry-picked forms conflict with the
current state of master due to further work, so here I'm just
recording an ancestry relation to indicate that there's nothing up to
here on 0.66 that master hasn't got.

...

This commit is contained in:

Simon Tatham 2015-11-07 09:14:42 +00:00

parent 323c3c70c9 3a43bec44c

commit 009ab4a20c

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

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

Diff Content Not Available