SZEDER Gábor [off-list ref] writes:
Dear All,
the documentation says following:
--unresolve::
Restores the 'unmerged' or 'needs updating' state of a
file during a merge if it was cleared by accident.
How could I clear those states by accident (or intentionally)?
"git add <file>", or "git update-index <file>", or error in handling
merge tool via git-mergetool.
--
Jakub Narebski
Poland
ShadeHawk on #git