Mercurial > hg
diff mercurial/templatekw.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 | 764adc332f6e |
children | 293930a1fa0a |