comparison bin/git-conflict @ 43:642841c0badb

Show username in ZSH prompt
author zegervdv <zegervdv@me.com>
date Thu, 24 Apr 2014 18:14:18 +0200
parents faf7781dae42
children
comparison
equal deleted inserted replaced
42:4c3b25554bbb 43:642841c0badb