Sync with Git 1.8.3.4
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:34:25 +0000 (22 11:34 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Jul 2013 18:34:25 +0000 (22 11:34 -0700)
1  2 
Documentation/git.txt
Documentation/user-manual.txt
builtin/apply.c

Simple merge
Simple merge
diff --cc builtin/apply.c
Simple merge