Allow drag&drop conflict files to main window
Windows visual diff and merge for files and directories
Brought to you by:
christianlist,
grimmdp
While I was doing some conflict file resolving after automatic merge, I was thinking about faster way to open conflict files. Current way involves browsing the file using normal Windows Open dialog. Which is a bit tedious if you have multiple files.
This patch allows one to drag&drop the conflict file to main window. WinMerge checks if one file was dropped and then checks if the file is a conflict file. Yes, it takes a bit of time to do this check. But it should not be visible for user for most files.
The patch.
Logged In: YES
user_id=631874
Originator: YES
Committed to SVN trunk:
Completed: At revision: 5426