DB/Tools: Fixed Windows merge tool file extension
Merge pull request #220 from Dekadencee/fix_windows_merge

DB/Tools: Fixed Windows merge tool file extension