Thomas Adam 253f1395a0 Don't rely on "-s ours" for merging ...

The ours strategy assumes one subsumes the other -- which isn't the case for
the portable version, so for now -- just go back to using the default merge
strategy of recursive, and fix-up any conflicts manually.

2012-09-24 18:05:34 +01:00

5.6 KiB

Raw Blame History

View Raw