ENH: Displaying conflicting files correctly
ENH: Displaying conflicting files correctly

jcfr/CDash,cpatrick/CDash,cpatrick/CDash,jcfr/CDash,jcfr/CDash,cpatrick/CDash,cpatrick/CDash,jcfr/CDash,cpatrick/CDash,cpatrick/CDash,jcfr/CDash,jcfr/CDash