From: Vincent van Ravesteijn <vfr@lyx.org>
Date: Mon, 12 Mar 2012 19:14:40 GMT
Subject: Edit a rerere conflict resolution
Message-ID: <4F5E4B20.5080709@lyx.org>

Hi all,

Would it be a useful addition to have a command 'git rerere edit <path> 
<commit>' ?

This would allow the user to edit the conflict resolution which was used 
in a certain commit (merge, rebase.. ).

Now I tend to grep in the .git/rr-cache directory, because I don't want 
to do 'git rerere forget' as this would require me to refix more 
resolution than needed.

Vincent