"Shawn O. Pearce" <spearce@xxxxxxxxxxx> writes: > 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. Will do. -- 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
