- Committer: John Arbash Meinel
- Date: 2009-01-20 18:13:50 UTC
- mto: (3954.1.1 bzr.integration) (3966.1.1 bzr.integration)
- Revision ID: john@arbash-meinel.com-20090120181350-wzl4x01ns3rly9y5
Fix an edge case with deleted files and criss-cross merges.
We wanted to be careful that if you had a criss-cross merge and both sides
resolved the conflict in a different way, that you got a conflict.
However, the original test was actually testing when one LCA dominated the
other, which is a case where we shouldn't conflict.
Test cases updated appropriately.
We wanted to be careful that if you had a criss-cross merge and both sides
resolved the conflict in a different way, that you got a conflict.
However, the original test was actually testing when one LCA dominated the
other, which is a case where we shouldn't conflict.
Test cases updated appropriately.
| Filename | Latest Rev | Last Changed | Committer | Comment | Size | ||
|---|---|---|---|---|---|---|---|
 ..
|
|||||||