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/t9500-gitweb-standalone-no-errors.sh | |
parent | Merge branch 'jc/maint-autofix-tag-in-head' (diff) | |
parent | mergetools/meld: Use '--output' when available (diff) | |
download | tgif-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/t9500-gitweb-standalone-no-errors.sh')
0 files changed, 0 insertions, 0 deletions