@matheusbsbs / matheus-bagliano / commits / d1c8c0c8c4
Fork 0

Merge branch 'maint'

* maint: diff -c -p: do not die on submodules Conflicts: combine-diff.c

Junio C Hamano committed Apr 29, 2009 at 16:50 UTC d1c8c0c8c42912eb768a05115c798de50e595f8b

No changes.