diff options
| author | Jan Pokorný <jpokorny@redhat.com> | 2013-04-15 18:50:54 +0200 |
|---|---|---|
| committer | Jan Pokorný <jpokorny@redhat.com> | 2013-04-15 18:50:54 +0200 |
| commit | 0fd9398f0a6c46c470dd53083270a37c08d83e5b (patch) | |
| tree | b3bfd8c1795e59a28add81ac683221c4927cdcd4 | |
| parent | 38945efd372d4cff8074453b35a1e65e386e1a55 (diff) | |
| download | dotfiles-0fd9398f0a6c46c470dd53083270a37c08d83e5b.tar.gz dotfiles-0fd9398f0a6c46c470dd53083270a37c08d83e5b.tar.xz dotfiles-0fd9398f0a6c46c470dd53083270a37c08d83e5b.zip | |
Update git config: 3way merge using meld
Signed-off-by: Jan Pokorný <jpokorny@redhat.com>
| -rw-r--r-- | .gitconfig | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -33,12 +33,13 @@ untracked = cyan # http://lukas.zapletalovi.com/2012/06/three-way-git-merging-and-meld.html +# -> http://lukas.zapletalovi.com/2012/09/three-way-git-merging-with-meld.html [merge] tool = mymeld conflictstyle = diff3 [mergetool "mymeld"] - cmd = meld --diff $BASE $LOCAL --diff $BASE $REMOTE --diff $LOCAL $MERGED $REMOTE + cmd = meld --diff $BASE $LOCAL --diff $BASE $REMOTE --diff $LOCAL $BASE $REMOTE $MERGED [sendemail] smtpserver = smtp.corp.redhat.com |