Git diff not working

[ArchitectCore]

windiff = difftool -g -y -t ExcelMerge throwing error
"fatal: --gui, --tool and --extcmd are mutually exclusive" in newer version of git. Earlier it use to work

[ArchitectCore]

Found this that Git is not allowing the use of -g and -t together as per this link
https://git.furworks.de/opensourcemirror/git/commit/7f978d7d10a87c4a56ea3101b936cddb25bbe2c6