Mercurial > hg
comparison mercurial/repoview.py @ 28071:261324dd5f5b
merge: introduce method to minimize merge regions
In the next diff, we will use this to trim down the start and end of conflict
regions where the A and B sides both made the same changes.
author | Ryan McElroy <rmcelroy@fb.com> |
---|---|
date | Wed, 10 Feb 2016 08:25:03 -0800 |
parents | 97e0dc6d248c |
children | 332926212ef8 |
comparison
equal
deleted
inserted
replaced
28070:a504794cee29 | 28071:261324dd5f5b |
---|