Mercurial > hg
comparison mercurial/pushkey.py @ 22030:ecdff28d13e2
mergetools: add a test for premerge --keep
It works! No surprise.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Mon, 04 Aug 2014 16:50:15 -0700 |
| parents | 2f52a16f2bee |
| children | b1d694d3975e |
comparison
equal
deleted
inserted
replaced
| 22029:f28329171a86 | 22030:ecdff28d13e2 |
|---|