Mercurial > hg
view mercurial/__init__.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 | 9117c6561b0b |
children | 4374d819ccd5 |