Andrew's git / gitweb.git / diff
?
Merge branch 'da/difftool-mergtool-refactor'
authorJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2011 23:00:43 +0000 (16:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 25 Aug 2011 23:00:43 +0000 (16:00 -0700)
* 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

No differences found