Johannes Schindelin <Johannes.Schindelin@xxxxxx> wrote:
>
> Now that MERGE_RR was moved out of .git/rr-cache/, we have to delete
> it somewhere else. Just in case somebody wants to use a newer git-gui
> with an older Git, the file .git/rr-cache/MERGE_RR is removed, too (if
> it exists).
>
> Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
Ack, I can pull this into git-gui.git. But I want to make sure
Junio is going to take 1/2 into git.git.
> git-gui/lib/merge.tcl | 1 +
> 1 files changed, 1 insertions(+), 0 deletions(-)
>
> diff --git a/lib/merge.tcl b/lib/merge.tcl
> index cc26b07..5c01875 100644
> --- a/lib/merge.tcl
> +++ b/lib/merge.tcl
> @@ -257,6 +257,7 @@ proc _reset_wait {fd} {
>
> catch {file delete [gitdir MERGE_HEAD]}
> catch {file delete [gitdir rr-cache MERGE_RR]}
> + catch {file delete [gitdir MERGE_RR]}
> catch {file delete [gitdir SQUASH_MSG]}
> catch {file delete [gitdir MERGE_MSG]}
> catch {file delete [gitdir GITGUI_MSG]}
> --
--
Shawn.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
