diff options
| author | Miquel Sabaté Solà <msabate@suse.com> | 2016-04-14 23:43:03 +0200 |
|---|---|---|
| committer | Miquel Sabaté Solà <msabate@suse.com> | 2016-04-15 00:11:54 +0200 |
| commit | 4da2fd9872bbeeda559a4ff8246d0b13c152f943 (patch) | |
| tree | 1bf8c95942bd9f859e7b39327fe78c656867090d /gitconfig | |
| parent | db17356eba8fab717400b3abc2eb7eb6c12757c9 (diff) | |
| download | dotfiles-4da2fd9872bbeeda559a4ff8246d0b13c152f943.tar.gz dotfiles-4da2fd9872bbeeda559a4ff8246d0b13c152f943.zip | |
git: use vimdiff as the merge tool
Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>
Diffstat (limited to 'gitconfig')
| -rw-r--r-- | gitconfig | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -32,6 +32,9 @@ [color] ui = true +[merge] + tool = vimdiff + [url "git://github.com/mssola/"] insteadOf = mssola: [url "git@github.com:mssola/"] |