Configure Git with global ignore-files
Configure Git to use SourceGear DiffMerge as a diff/merge tool