Mercurial > hg
view hgext/__init__.py @ 21632:3191d330302f
mergetools.hgrc: add minimal configuration for editmerge
The ``editmerge`` script is shipped in contrib and opens an editor on
every conflicting file. It needs minimal configuration to inject the
config marker in the file before opening. Otherwise it behaves the
same as ``internal:local`` and bad things happen.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Thu, 29 May 2014 12:25:25 -0700 |
| parents | 7d439981bec4 |
| children | 155e3308289c |