comparison mercurial/merge.py @ 2988:63c3a1921a67

Add ui.strict config item. This turns off command matching by unambiguous prefix, and is a good thing if you want to write future-proof scripts. This fixes issue 314.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 21 Aug 2006 21:59:29 -0700
parents 8743188f4d2e
children 545d33aa3f82
comparison
equal deleted inserted replaced
2987:12d1475b48df 2988:63c3a1921a67