Commit 25743bd7c5f14f2287d9c4fdf953c978e3b16916

Edward Thomson 2013-01-12T13:47:56

add an index_remove_bypath that removes conflicts, renamed add_from_workdir to match