[hg] fails to handle a merge where one side has a file with a given name, while another has a directory with the same name. *shakes fist*
Ben Matasar
I'm Ben. I work at Twitter, on Vote Track OR and the Bus Project. Follow me on Twitter, if you like.
