[Enhancement] Additional custom arguments for diff/merge tool #1971
Description
Allow for additional custom arguments to be passed to the merge/diff tool. For example, when using Meld and wanting to enable the auto merge feature a user could provide the --auto-merge argument.