Mon, 19 May 2014 01:53:34 +0200 update: introduce --tool for controlling the merge tool
Mads Kiilerich <madski@unity3d.com> [Mon, 19 May 2014 01:53:34 +0200] rev 21552
update: introduce --tool for controlling the merge tool Update is a kind of merge and may also need a merge tool and should have the options described in the merge-tools help.
Fri, 02 May 2014 01:09:14 +0200 merge: fix stupid indentation left over from previous refactorings
Mads Kiilerich <madski@unity3d.com> [Fri, 02 May 2014 01:09:14 +0200] rev 21551
merge: fix stupid indentation left over from previous refactorings
(0) -10000 -3000 -1000 -300 -100 -30 -10 -2 +2 +10 +30 +100 +300 +1000 +3000 +10000 +30000 tip