Alexander Gavrilov schrieb: > Tools like rerere leave files marked as conflicts in the index, > while actually resolving them in the working copy. Also, some > people like to use an external editor to resolve conflicts. > > This patch restores functionality previously removed in > commit 617ceee653 by adding a new context menu item. > It still ensures that the user does not stage conflicting files > accidentally by clicking on the icon instead of the name. Thanks! Works well here. Tested-by: Johannes Sixt <johannes.sixt@xxxxxxxxxx> -- Hannes -- 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
