Commit ecd60a56ebd6bdc347a486f53da7de0febef58cf
2015-05-14T11:52:48
conflicts: when adding conflicts, remove staged When adding a conflict for some path, remove the staged entry. Otherwise, an illegal index (with both stage 0 and high-stage entries) would result.