Mercurial > hg
diff hgext/eol.py @ 21402:c915d066bcac
help: add additional information in the merge-tools section of config help
The merge tool configuration in general has always been a confusing topic for
user. We add mention of:
- possible pre-existing configuration,
- way to look at it,
- the more detailed help topic about how merge-tools configuration works.
This should help users find they way.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Mon, 12 May 2014 17:40:58 -0700 |
parents | 6500a2eebee8 |
children | fb3e63c603e8 |