log

age author description
Mon, 19 May 2014 01:53:34 +0200 Mads Kiilerich update: introduce --tool for controlling the merge tool
Fri, 02 May 2014 01:09:14 +0200 Mads Kiilerich merge: fix stupid indentation left over from previous refactorings
Mon, 26 May 2014 12:39:31 -0400 Augie Fackler Merge with stable