changeset 1308 | 2073e5a71008 |
parent 260 | d7ce76d82876 |
child 2227 | 4f072bb06e89 |
--- a/notes.txt +++ b/notes.txt @@ -91,7 +91,7 @@ need to be added, deleted, and merged. Then for each file, we perform a graph merge and resolve as above. It's important to merge files using per-file DAGs rather than just -changeset level DAGs as this diagram illustrates: +changeset level DAGs as this diagram illustrates: M M1 M2