sixam/minertrade
2
0
Fork 0
mirror of https://gitlab.com/lunovox/minertrade.git synced 2025-09-22 11:26:53 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Melhorando tradução!

Browse source
This commit is contained in:
Lunovox Heavenfinder 2020-04-08 22:23:57 -03:00
parent 05a2b627aa
commit d58a013b30
3 changed files with 457 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
.gitconfig Normal file
View file

@ -0,0 +1,16 @@
# Add the following to your .gitconfig file.
[diff]
tool = meld
[difftool]
prompt = false
[difftool "meld"]
cmd = meld "$LOCAL" "$REMOTE" #
# Add the following to your .gitconfig file.
[merge]
tool = meld
[mergetool "meld"]
# Choose one of these 2 lines (not both!) explained below.
cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
cmd = meld "$LOCAL" "$BASE" "$REMOTE" --output "$MERGED"