diff bin/git-conflict @ 42:4c3b25554bbb

Enable smart folding
author zegervdv <zegervdv@me.com>
date Mon, 21 Apr 2014 11:36:34 +0200
parents faf7781dae42
children
line wrap: on
line diff