diff bin/git-conflict @ 170:1cdae31a21da

Add signingkey to gitconfig
author zegervdv <zegervdv@me.com>
date Sun, 02 Nov 2014 17:39:57 +0100
parents faf7781dae42
children
line wrap: on
line diff