diff options
| author | Nicholas Marriott <nicholas.marriott@gmail.com> | 2012-09-25 08:07:39 +0100 |
|---|---|---|
| committer | Nicholas Marriott <nicholas.marriott@gmail.com> | 2012-09-25 08:07:39 +0100 |
| commit | 149f5bac05584b83778c4803b2f1a54a57d7d84d (patch) | |
| tree | 8cd323235276ddf4b562894be0e6a82f3be08a82 /SYNCING | |
| parent | 7b189f1ad78e8ad96a6896b2640fc0bbd3003201 (diff) | |
| parent | 253f1395a03b7b3371799055a7e3a442a8fa7ba6 (diff) | |
| download | rtmux-149f5bac05584b83778c4803b2f1a54a57d7d84d.tar.gz rtmux-149f5bac05584b83778c4803b2f1a54a57d7d84d.tar.bz2 rtmux-149f5bac05584b83778c4803b2f1a54a57d7d84d.zip | |
Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmux
Conflicts:
cmd.c
format.c
osdep-openbsd.c
Diffstat (limited to 'SYNCING')
| -rw-r--r-- | SYNCING | 6 |
1 files changed, 2 insertions, 4 deletions
@@ -113,11 +113,9 @@ portable: % git log master..obsd-master -From there, the merge should be a fast-forward, using the OURS strategy to -tell git that conflicts coming from OpenBSD respect the existing code in -tmux where those conflicts wouldn't arise. Hence: +From there, merge the result in, fixing up any conflicts which might arise. -% git merge -s ours obsd-master +% git merge obsd-master Then ensure things look correct by BULDING the result of that sync: |