diff bin/git-conflict @ 140:e037d9b797eb

Fix colors and clipboad in vim and tmux
author zegervdv <zegervdv@me.com>
date Wed, 08 Oct 2014 23:27:50 +0200
parents faf7781dae42
children
line wrap: on
line diff