From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Wed, 5 Oct 2005 15:58:18 +0000 (+0100)
Subject: Add a --reset option to resolved
X-Git-Tag: v0.8~76
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/7c47d096c74a2654fc9d67490adbe3066d24df98?hp=7c47d096c74a2654fc9d67490adbe3066d24df98

Add a --reset option to resolved

With this option one can ask for a conflicted file to be reset to one of
the local, remote or older states.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
---