Code

Merge branch 'jk/asciidoc-update' into next
authorJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:27 +0000 (12:25 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 8 Dec 2010 20:25:27 +0000 (12:25 -0800)
* jk/asciidoc-update:
  docs: default to more modern toolset

1  2 
Documentation/RelNotes/1.7.4.txt
Makefile
config.mak.in
configure.ac

Simple merge
diff --cc Makefile
Simple merge
diff --cc config.mak.in
Simple merge
diff --cc configure.ac
Simple merge