Skip to content
Snippets Groups Projects
Commit 132aa0ed authored by ram's avatar ram
Browse files

Fixed a bug in MERGE-ALIAS-CONFLICTS where conflicts could fail to be

properly inserted into the original TNs conflicts list.
parent 6096db5c
No related branches found
No related tags found
No related merge requests found
...@@ -947,7 +947,7 @@ ...@@ -947,7 +947,7 @@
(setf (global-conflicts-tn-next oprev) conf) (setf (global-conflicts-tn-next oprev) conf)
(setf (tn-global-conflicts original) conf)) (setf (tn-global-conflicts original) conf))
(change-global-conflicts-tn conf original) (change-global-conflicts-tn conf original)
(shiftf conf (global-conflicts-tn-next conf) oconf)) (shiftf oprev conf (global-conflicts-tn-next conf) oconf))
(t (t
(merge-alias-block-conflicts conf oconf) (merge-alias-block-conflicts conf oconf)
(shiftf oprev oconf (global-conflicts-tn-next oconf)) (shiftf oprev oconf (global-conflicts-tn-next oconf))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment