-
Committer:
Gordon Tyler
-
Date:
2010-12-07 03:15:30 UTC
-
mto:
This revision was merged to the branch mainline in
revision
5632.
-
Revision ID:
gordon@doxxx.net-20101207031530-vaasidge1ajw97k4
Changed known merge tools into a default set of merge tools that are always defined but can be overridden by user-defined merge tools.