From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 14 Feb 2012 20:57:17 +0000 (-0800)
Subject: Merge branch 'jk/userdiff-config-simplify'
X-Git-Tag: v1.7.10-rc0~86
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=63d37c3062e13cb2828edf63bc03cce1b6c41fd0;p=git.git

Merge branch 'jk/userdiff-config-simplify'

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

63d37c3062e13cb2828edf63bc03cce1b6c41fd0