Update meld as diff tool for git
add test
modify test
modify test
Merge branch 'master' into test
modify test
update gitconfig
remove test