diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-05-23 01:41:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-05-23 01:41:51 -0700 |
| commit | bbc0995792880d9f87f5c1a871f5f55b7284c7f1 (patch) | |
| tree | 70b605f42e50d75e7a79f0407287722c1b30ceb2 /Makefile | |
| parent | d34f715853526bf55f1fa422d56608c32433c8d1 (diff) | |
| parent | 4481ff048df4c86021d783de6f099909495f04ff (diff) | |
| download | git-bbc0995792880d9f87f5c1a871f5f55b7284c7f1.tar.gz git-bbc0995792880d9f87f5c1a871f5f55b7284c7f1.tar.xz | |
Merge branch 'da/mergetool-lib'
* da/mergetool-lib:
mergetool--lib: specialize diff options for emerge and ecmerge
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions