diff bin/git-conflict @ 41:1b3381f349f0

Improve zsh prompt
author zegervdv <zegervdv@me.com>
date Fri, 18 Apr 2014 11:16:02 +0200
parents faf7781dae42
children
line wrap: on
line diff