On Sun, 10 May 2009 18:33:36 +0200, Alex Riesen <raa.lkml@xxxxxxxxx> wrote: > I still have the patch below (rebased) in my tree. > Was the problem fixed somehow differently? > Subject: [PATCH] Update index after refusing to rewrite files unchanged > during merge I tested recently, and it does not appear to be fixed yet. However, your patch was not enough to fix my test case completely, so I am unsure whether it makes sense to apply it as a partial fix. The test is here: http://article.gmane.org/gmane.comp.version-control.git/116999 Anders. -- 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