Branch: refs/heads/master
Home: https://github.com/tmux/tmux
Commit: 0f9354eec211247fc83d1397d12c7e0708f70285
https://github.com/tmux/tmux/commit/0f9354eec211247fc83d1397d12c7e0708f70285
Author: Nicholas Marriott <[email protected]>
Date: 2017-01-25 (Wed, 25 Jan 2017)
Changed paths:
M Makefile.am
M cmd-bind-key.c
M cmd-list-keys.c
M cmd-unbind-key.c
R mode-key.c
M server.c
M window-choose.c
Log Message:
-----------
Bad merge.
--
You received this message because you are subscribed to the Google Groups
"tmux-git" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
