Mercurial > hg
comparison mercurial/transaction.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 | c77418938d05 |
children | e59b5e5918a5 |
comparison
equal
deleted
inserted
replaced
22030:ecdff28d13e2 | 22031:b36c60cfe46f |
---|