@@ -391,7 +391,7 @@ namespace GitUI InvokeEvent(PostResolveConflicts); - return false; + return true; } public bool StartCherryPickDialog() GitUI/GitUICommands.cs db82226b02c192aa9dbb2d0d8a59d2a8b41bb951 Henk Westhuis Henk_Westhuis@hotmail.com http://github.com/spdr870/gitextensions/commit/1ee3013e7445a5203560870bf8fd22e4fdb54a29 1ee3013e7445a5203560870bf8fd22e4fdb54a29 2009-11-03T10:37:30-08:00 2009-11-03T10:37:30-08:00 Refresh revision dialog after solving mergeconflict. 54004074d610ac5a31c2f086f6f847f69645dde4 Henk Westhuis Henk_Westhuis@hotmail.com