| commit | 63d37c3062e13cb2828edf63bc03cce1b6c41fd0 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Feb 2012 20:57:17 +0000 (14 12:57 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 14 Feb 2012 20:57:17 +0000 (14 12:57 -0800) | ||
| tree | 058aa2fe3f357e626c3458a89443ea07fa0f5345 | treesnapshot (tar.gz zip) |
| parent | 5f90b6fa0f5cf1d06bc72ffe607be3cd6aa955b5 | commitdiff |
| parent | 6680a0874f86600cc8b4b5327384934d83d752a8 | commitdiff |
Merge branch 'jk/userdiff-config-simplify'
* jk/userdiff-config-simplify:
drop odd return value semantics from userdiff_config
* jk/userdiff-config-simplify:
drop odd return value semantics from userdiff_config
| diff.c | diff1 | diff2 | blobhistory |