diff bin/git-conflict @ 9:aeb4af7c7fb6

update tmux conf
author zegervdv <zegervdv@me.com>
date Sat, 01 Mar 2014 22:41:31 +0100
parents d35280c9b023
children faf7781dae42
line wrap: on
line diff