Mercurial > hg
comparison mercurial/ancestor.py @ 22026:6966542768ff
filemerge: allow the formatting of three labels instead of two
When a third label is provided (to included the base content) it is properly
processed as the two others. Nothing changes if only two labels are provided.
| author | Pierre-Yves David <pierre-yves.david@fb.com> |
|---|---|
| date | Tue, 05 Aug 2014 15:17:38 -0700 |
| parents | 64911a12dc28 |
| children | baecf4e1b7d0 |
comparison
equal
deleted
inserted
replaced
| 22025:5f22975d320d | 22026:6966542768ff |
|---|