Alexander Gavrilov schrieb: > This restores functionality of the file icon for unmerged files. > Safety is enforced by loading the diff and checking for lines > that look like conflict markers. If such lines are found, or > the conflict involves deletion and/or symlinks, a confirmation > dialog is presented. Otherwise, the icon immediately stages the > working copy version of the file. > > Includes a revert of 2fe5b2ee42897a3acc78e5ddaace3775eb2713ca > (Restore ability to Stage Working Copy for conflicts) Thanks, works fine after a brief test: 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
