added script for git merge/diff