You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
⚠️ The sections below must be filled in and this text must be removed or the issue will be closed.
Current behaviour
Expected behaviour
Steps to reproduce
Error Details
System.ArgumentNullException: Value cannot be null.
Parameter name: path3
at System.IO.Path.Combine(String path1, String path2, String path3)
at GitUI.CommandsDialogs.SettingsDialog.MergeToolsHelper.FindFileInFolders(String fileName, String[] locations)
at GitUI.CommandsDialogs.SettingsDialog.MergeToolsHelper.FindMergeToolFullPath(ConfigFileSettingsSet settings, String mergeToolText, String& exeName)
at GitUI.CommandsDialogs.SettingsDialog.Pages.GitConfigSettingsPage.MergeToolCmdSuggest_Click(Object sender, EventArgs e)
at System.Windows.Forms.Control.OnTextChanged(EventArgs e)
at System.Windows.Forms.ComboBox.OnTextChanged(EventArgs e)
at System.Windows.Forms.Control.set_Text(String value)
at System.Windows.Forms.ComboBox.set_Text(String value)
at System.Windows.Forms.ComboBox.UpdateText()
at System.Windows.Forms.ComboBox.WmReflectCommand(Message& m)
at System.Windows.Forms.ComboBox.WndProc(Message& m)
at System.Windows.Forms.NativeWindow.Callback(IntPtr hWnd, Int32 msg, IntPtr wparam, IntPtr lparam)
Additional information
Open Settings and change merge tool to TortoiseMerge.
Sadly, it appears some important information is still missing, which you may have overlooked while submitting the bug.
Without this information we may not be able to assist you in resolving the issue.
Please review your submission, fill the missing information in and post a new comment to ping us back to re-open the issue.
Thanks again
Duplicate of #7169
Corrected in master
(No real workaround, you can use the portable version to set TortoiseMerge as mergetool or install without plugins.)
Current behaviour
Expected behaviour
Steps to reproduce
Error Details
Additional information
Open Settings and change merge tool to TortoiseMerge.
Environment
The text was updated successfully, but these errors were encountered: