Johannes Sixt <j6t@xxxxxxxx> writes: > Your implementation forgets to re-insert the forgotten resolutions into > MERGE_RR, therefore, the next 'git rerere' does not record the new > resolution. > > In my implementation of 'rerere forget', I had the following tests. Please filfre to roll a patch that adds the tests and code that inserts necessary MERGE_RR entries, if the feature is pressing; unfortunately I don't think I will have much git time during the coming weekend. -- 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