Mercurial > hg

diff mercurial/merge.py @ 28071:261324dd5f5b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 e397b58c0563
children 19424f960bf5
line wrap: on
line diff