moved .dev/mergeGit.py to new files in mergeTool