Merge branch 'da/difftool' into next
commit400839c17af8462968a9a73b3107e9c0879f77bf
authorJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2009 07:34:45 +0000 (23 00:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 23 Mar 2009 07:34:45 +0000 (23 00:34 -0700)
tree4a9ffe607d50f3363bef35330f0c618a925ac6cc
parent66f8b961cc96b0b15d60af597a53df3f7a833024
parentd3b8cec780279a2808295ca7e6a8abcf68b4a05e
Merge branch 'da/difftool' into next

* da/difftool:
  difftool: move 'git-difftool' out of contrib
Documentation/config.txt
Makefile