diff bin/git-conflict @ 125:18db7404aaf2

Improve zsh prompt
author zegervdv <zegervdv@me.com>
date Tue, 30 Sep 2014 09:36:17 +0200
parents faf7781dae42
children
line wrap: on
line diff