Mercurial > hg
diff mercurial/revlog.py @ 27025:ec37257341a9
resolve: fix incorrect merge
The merge from stable into default was semantically incomplete -- a couple of
changes in preceding code had to be rewritten here.
This code only triggers for change/delete conflicts, so we can't test it yet.
We will soon be able to do it, though.
author | Siddharth Agarwal <sid0@fb.com> |
---|---|
date | Wed, 18 Nov 2015 23:43:18 -0800 |
parents | dfab6edb98e3 |
children | 7860366b46c9 |