Mercurial > hg
diff mercurial/dispatch.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 | 6822f9382b4c |
children | a6344df5108e |