moved git mergetool files into new folder