Merge branch 'jk/userdiff-config-simplify' into next
commite9854c10a2f9894d9b20ff8b7ae35639b497409c
authorJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2012 22:23:52 +0000 (10 14:23 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 10 Feb 2012 22:23:52 +0000 (10 14:23 -0800)
tree0b40e2f1385899efb52fd231265a391540233883
parente0040cf0691ca0a64a7dce517150be9c307bb8fb
parent6680a0874f86600cc8b4b5327384934d83d752a8
Merge branch 'jk/userdiff-config-simplify' into next

* jk/userdiff-config-simplify:
  drop odd return value semantics from userdiff_config
builtin/grep.c
diff.c