diff hgweb.cgi @ 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 85cba926cb59
children 4b0fc75f9403
line wrap: on
line diff