diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-08-25 16:00:43 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-08-25 16:00:43 -0700 |
| commit | 3f1c70f717da3c9ec6ae3744593c7f9f3729aad7 (patch) | |
| tree | 2ae895eba594851c845af80b4d60cd584e59f0b6 /t | |
| parent | 9bf0eedd1d789fecbc9959e2c2122d34c123863c (diff) | |
| parent | f61bd9c68a4ed81afcc1fbbf5b956e781d88b434 (diff) | |
| download | git-3f1c70f717da3c9ec6ae3744593c7f9f3729aad7.tar.gz git-3f1c70f717da3c9ec6ae3744593c7f9f3729aad7.tar.xz | |
Merge branch 'da/difftool-mergtool-refactor'
* da/difftool-mergtool-refactor:
mergetools/meld: Use '--output' when available
mergetool--lib: Refactor tools into separate files
mergetool--lib: Make style consistent with git
difftool--helper: Make style consistent with git
Diffstat (limited to 't')
0 files changed, 0 insertions, 0 deletions