From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 25 Dec 2009 23:51:32 +0000 (-0800)
Subject: rerere forget path: forget recorded resolution
X-Git-Tag: v1.7.0-rc0~61^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/dea4562bf5d1c27cd6c01b9cb65c3a8b8ee99a69?hp=dea4562bf5d1c27cd6c01b9cb65c3a8b8ee99a69

rerere forget path: forget recorded resolution

After you find out an earlier resolution you told rerere to use was a
mismerge, there is no easy way to clear it.  A new subcommand "forget" can
be used to tell git to forget a recorded resolution, so that you can redo
the merge from scratch.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---