Show More
@@ -748,7 +748,7 b' class localrepository(repo.repository):' | |||
|
748 | 748 | return flog.add(text, meta, tr, linkrev, fparent1, fparent2) |
|
749 | 749 | |
|
750 | 750 | # are just the flags changed during merge? |
|
751 |
if fparent1 != |
|
|
751 | if fparent1 != fparent2o and manifest1.flags(fname) != fctx.flags(): | |
|
752 | 752 | changelist.append(fname) |
|
753 | 753 | |
|
754 | 754 | return fparent1 |
General Comments 0
You need to be logged in to leave comments.
Login now