Merge branch 'jc/diff-prefix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2008 03:30:07 +0000 (20:30 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Sep 2008 03:30:07 +0000 (20:30 -0700)
commite69a6f47c4e25a20170eb989a55257d0399f795b
tree4891b8d55a9d188ad695c7da5c35c3744d1909b6
parentc4398286fa5245cf54d73f6016444179d73f140b
parenta5a818ee4877e4458e8e6741a03ac3b19941d58a
Merge branch 'jc/diff-prefix'

* jc/diff-prefix:
  diff: vary default prefix depending on what are compared
Documentation/config.txt
builtin-diff.c
combine-diff.c
diff.c
diff.h