Merge pull request #1239 from ethomson/index_remove add an index_remove_bypath that removes conflicts
2013-01-17T16:56:57