Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Sun, 12 Oct 2008 20:21:17 +0000 (13:21 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Sun, 12 Oct 2008 20:21:17 +0000 (13:21 -0700)
* maint:
  test-lib: fix broken printf
  git apply --directory broken for new files

1  2 
builtin-apply.c
t/test-lib.sh

diff --cc builtin-apply.c
Simple merge
diff --cc t/test-lib.sh
Simple merge