Merge branch 'maint'
commit5c283eb13c94be6ca974aa722159dc9838d10d97
authorShawn O. Pearce <spearce@spearce.org>
Sun, 12 Oct 2008 20:21:17 +0000 (12 13:21 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Sun, 12 Oct 2008 20:21:17 +0000 (12 13:21 -0700)
treee10f2dfa699ffe69b2b5e9a215c905b76ee4e77c
parentb75271d93a9e4be960d53fc4f955802530e0e733
parent72d404debaa804fca82fd9cf710fbde48c7305c6
Merge branch 'maint'

* maint:
  test-lib: fix broken printf
  git apply --directory broken for new files
builtin-apply.c
t/test-lib.sh