Author | SHA1 Message | Date |
---|---|---|
Jaime van Kessel | b175e6876f Added material conflict option | 8 years ago |
Jaime van Kessel | bbf5c73dae Quality_changes user option is now set correctly | 8 years ago |
Jaime van Kessel | f0eb5e0da3 User can now select what strategy to use per conflict | 8 years ago |
Jaime van Kessel | cbcc48ff33 Pre-read now checks for conflicts and asks the user what strategy for resolvement to use | 8 years ago |