![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 25 Aug 2011 23:00:43 +0000 (16:00 -0700) | ||
| committer | Junio 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
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
| 1 | 2 | |||
|---|---|---|---|---|
| Makefile | patch | | diff1 | | diff2 | | blob | history |
diff --cc Makefile
Simple merge