Merge remote-tracking branch 'origin/maint-0.2.3'

Browse Source

Use the "ours" strategy so that we retain 4aff97cfc7, which maint-0.2.3
just reverted.

...

This commit is contained in:

Nick Mathewson

2012-09-12 15:38:33 -04:00

parent 35e19b9498 45439bfced

commit 79b31dd4f8

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