Originate/git-town — pull request #178 by kevgo (2014-11-22 18:33:41+00:00)
Title: Make open changes conflicting

@charlierudolph this implements #176. What do you think?