log bin/git-conflict @ 26:0bf5f68cf4f9

age author description
Sun, 23 Feb 2014 18:52:12 +0100 zegervdv Add custom CLI tools