Merge branch 'maint-1.7.0' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 4 May 2010 22:20:47 +0000 (15:20 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 4 May 2010 22:20:47 +0000 (15:20 -0700)
* maint-1.7.0:
remove ecb parameter from xdi_diff_outf()

1  2 
diff.c
xdiff-interface.c
xdiff-interface.h
diff --cc diff.c
Simple merge
Simple merge
Simple merge