Git Merge Tool Local Basement