comparison mercurial/strutil.py @ 22031:b36c60cfe46f

merge-tools: make premerge valid values extensible We want to introduce a version leaving merge3 style markers.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Mon, 04 Aug 2014 16:58:39 -0700
parents 25e572394f5c
children b723f05ec49b
comparison
equal deleted inserted replaced
22030:ecdff28d13e2 22031:b36c60cfe46f