| commit | bc70c33fb40ad49eef7b68a00ee6411dca71e815 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 18 May 2009 16:10:08 +0000 (18 09:10 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 18 May 2009 16:10:08 +0000 (18 09:10 -0700) | ||
| tree | 61ca7c9f65e171ec1e41537e9ee622e361249d73 | treesnapshot (tar.gz zip) |
| parent | 324b976bf7bd53d179a9b3f1eb87c3335afbfd19 | commitdiff |
| parent | 4481ff048df4c86021d783de6f099909495f04ff | commitdiff |
Merge branch 'da/mergetool-lib' into next
* da/mergetool-lib:
mergetool--lib: specialize diff options for emerge and ecmerge
* da/mergetool-lib:
mergetool--lib: specialize diff options for emerge and ecmerge