doy/dist-checkconflicts — pull request #1 by karenetheridge (2012-03-13 20:45:11+00:00)
Title: fix for RT#75486: instead of silently ignoring conflicts that do not com...

...pile, issue a conflict warning