Merge branch 'maint-1.6.0' into maint
commit325e9bca373349c028a72a796ebcff0732092759
authorJunio C Hamano <gitster@pobox.com>
Sat, 28 Feb 2009 22:05:09 +0000 (28 14:05 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sat, 28 Feb 2009 22:05:09 +0000 (28 14:05 -0800)
tree6ec73dcf010008ed5d2864408d9d5f6bdedfa3d5
parente43a6fd3e94888d76779ad79fb568ed180e5fcdf
parenteb006ccfca019b4e96210310d9f823d050127b22
Merge branch 'maint-1.6.0' into maint

* maint-1.6.0:
  added missing backtick in git-apply.txt
Documentation/git-apply.txt