Renomeando test.txt pra gitconfig.txt e inserindo cmd de configuracao do
kdiff3
Merge branch 'master' of github.com:demonstrativo/laughing-archer