| commit | bbc0995792880d9f87f5c1a871f5f55b7284c7f1 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Sat, 23 May 2009 08:41:51 +0000 (23 01:41 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 23 May 2009 08:41:51 +0000 (23 01:41 -0700) | ||
| tree | 70b605f42e50d75e7a79f0407287722c1b30ceb2 | treesnapshot (tar.gz zip) |
| parent | d34f715853526bf55f1fa422d56608c32433c8d1 | commitdiff |
| parent | 4481ff048df4c86021d783de6f099909495f04ff | commitdiff |
Merge branch 'da/mergetool-lib'
* da/mergetool-lib:
mergetool--lib: specialize diff options for emerge and ecmerge
* da/mergetool-lib:
mergetool--lib: specialize diff options for emerge and ecmerge