resolve-undo: "checkout -m path" uses resolve-undo information