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
Thomas Adam
dc3df931d7
Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmux
...
Conflicts:
SYNCING
2012-09-20 23:02:49 +01:00
Thomas Adam
d3d48fa3e7
Add release instructions for new tmux versions
...
Document how actual releases will happen. Largely based on tcunha's
original notes. Tweaked by me slightly to adapt to git.
2012-09-20 22:59:08 +01:00
Thomas Adam
73f29094d0
.+ SYNCING.
2012-09-19 09:50:39 +01:00
Thomas Adam
a043b975ca
Add SYNCING document
...
This explains how to keep the tmux and tmux-openbsd repositories in sync
with one another during the course of tmux development.
2012-09-16 22:53:58 +01:00
