![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 4 May 2010 22:20:47 +0000 (15:20 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 4 May 2010 22:20:47 +0000 (15:20 -0700) | ||
| commit | 6b6f5d4664c9088636418653a61f600b5e3a9ea4 | |
| tree | 8e9f5db3e5efb83423784509a3154c1b11022bfa | tree | snapshot |
| parent | 2b873e064c4eac816887f823c1dfefbc9c3b4b0e | commit | diff |
| parent | dfea79004c54bc96143386d6ac22de500ba4f747 | commit | diff |
Merge branch 'maint-1.7.0' into maint
* maint-1.7.0:
remove ecb parameter from xdi_diff_outf()
* maint-1.7.0:
remove ecb parameter from xdi_diff_outf()
| diff.c | diff1 | | diff2 | | blob | history |
| xdiff-interface.c | diff1 | | diff2 | | blob | history |
| xdiff-interface.h | diff1 | | diff2 | | blob | history |