Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | fix for RT#75486: instead of silently ignoring conflicts that do not ↵ | Karen Etheridge | 2013-06-21 | 2 | -0/+12 |
| | | | | compile, issue a conflict warning | ||||
* | initial implementation | Jesse Luehrs | 2010-11-21 | 2 | -0/+24 |