mhop/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

initial

Browse Source
This commit is contained in:
Marc Hoppe
2014-02-14 17:25:31 +01:00
committed by Marc Hoppe
commit 5e74a24df8
3 changed files with 150 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.gitconfig Normal file
View File

@@ -0,0 +1,8 @@
[mergetool "meld2way"]
cmd = meld \"$LOCAL\" \"$MERGED\" \"$REMOTE\"
[mergetool "meld3way"]
cmd = meld --output \"$MERGED\" \"$LOCAL\" \"$BASE\" \"$REMOTE\"
[merge]
tool = meld2way
[include]
path = ~/.gituser