diff bin/git-conflict @ 161:53a5e5db21c5

Remove stupid most and go back to less
author zegervdv <zegervdv@me.com>
date Fri, 24 Oct 2014 19:26:16 +0200
parents faf7781dae42
children
line wrap: on
line diff