darcs

Issue 1958 conflict marking order is not consistent

Title conflict marking order is not consistent
Priority bug Status needs-reproduction
Milestone Resolved in
Superseder Nosy List dmitry.kurochkin, kowey
Assigned To
Topics Conflicts, UI

Created on 2010-09-19.08:04:37 by kowey, last changed 2010-09-19.08:04:37 by kowey.

Messages
msg12587 (view) Author: kowey Date: 2010-09-19.08:04:35
Forked off issue833.

Could I get an investigation and explanation for why this is the case? I
imagine it has something to do with conflict marking being done on a
primitives level, but why do the sides get flipped around?

Might be an easier milestone than issue833
History
Date User Action Args
2010-09-19 08:04:37koweycreate