Fazendo Git Diff com Meld no Windows

From Basef
Revision as of 17:48, 2 September 2019 by Admin (Talk | contribs)

(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to: navigation, search

1) Instalar o Meld e adicionar no PATH do Windows (ex.: deve ser possível abrir o prompt e digitar "meld");

2) Criar o arquivo `.gitdiff.script` na pasta HOME do usuário:

#!/bin/bash
meld "$2" "$5"

3) Adicionar o seguinte no arquivo `.gitconfig` na pasta HOME do usuário:

[merge]
	tool = meld
[mergetool "meld"]
	path = "meld.exe"
	cmd = "meld.exe"
[diff]
	tool = "meld"
	guitool = "meld"
	external = ~/.gitdiff.script
[difftool "meld"]
	path = "meld.exe"
	cmd = "meld.exe"