Merge branch 'master' of ssh://tmux.git.sourceforge.net/gitroot/tmux/tmux

Conflicts:
	SYNCING
This commit is contained in:
Thomas Adam 2012-09-20 23:02:49 +01:00
commit dc3df931d7

View File

@ -99,7 +99,7 @@ line, as in:
% cd /path/to/tmux % cd /path/to/tmux
% git config --add remote.origin.fetch '+refs/replace/*:refs/replace/*' % git config --add remote.origin.fetch '+refs/replace/*:refs/replace/*'
% git fetch origin --all % git fetch origin
Performing the Sync Performing the Sync
=================== ===================