Conflict resolution view does not display the files that have been "staged" therefore giving the user misleading information regarding the current state of the conflict resolution process. Being able to undo the decision for a given file would of course be even better - it the case of many conflicts currently the whole operation needs to be aborted if there is an user error (e.g. incorrectly choosing THEIRS instead of OURS).
Conflict resolution view does not display the files that have been "staged" therefore giving the user misleading information regarding the current state of the conflict resolution process. Being able to undo the decision for a given file would of course be even better - it the case of many conflicts currently the whole operation needs to be aborted if there is an user error (e.g. incorrectly choosing THEIRS instead of OURS).