diff options
| author | Thomas Adam <thomas@xteddy.org> | 2012-09-24 18:03:04 +0100 |
|---|---|---|
| committer | Thomas Adam <thomas@xteddy.org> | 2012-09-24 18:05:34 +0100 |
| commit | 253f1395a03b7b3371799055a7e3a442a8fa7ba6 (patch) | |
| tree | 63acaecc3becf3d980f1b197e4e6bcad49a86951 /osdep-darwin.c | |
| parent | e342304134b8012ae62cb627dc9e322411dd48b1 (diff) | |
| download | rtmux-253f1395a03b7b3371799055a7e3a442a8fa7ba6.tar.gz rtmux-253f1395a03b7b3371799055a7e3a442a8fa7ba6.tar.bz2 rtmux-253f1395a03b7b3371799055a7e3a442a8fa7ba6.zip | |
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.
Diffstat (limited to 'osdep-darwin.c')
0 files changed, 0 insertions, 0 deletions