Mercurial > hg
diff tests/test-subrepo-svn.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 | 6252b4f1c4b4 |
children | ab3e42225dbc |