comparison tests/test-convert-hg-source.t @ 18385:bafbfe0b450c

docs: "deprecate" checkchanged and checkconflicts in merge-tool configuration These settings were replaced by check=changed and check=conflicts in a912f26777d3. There is no reason to announce two different ways to achieve the same. The old way should be kept but not announced.
author Mads Kiilerich <madski@unity3d.com>
date Tue, 15 Jan 2013 23:30:10 +0100
parents 8149ff405c78
children ca275f7ec576
comparison
equal deleted inserted replaced
18384:e389a25e7e60 18385:bafbfe0b450c