Merge branch 'jk/userdiff-config-simplify'

* jk/userdiff-config-simplify: drop odd return value semantics from userdiff_config

Junio C Hamano committed Feb 14, 2012 at 12:57 UTC 63d37c3062e13cb2828edf63bc03cce1b6c41fd0

No changes.