Merge branch 'mv/commit-tree'
authorShawn O. Pearce <spearce@spearce.org>
Thu, 25 Sep 2008 16:16:33 +0000 (09:16 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 25 Sep 2008 16:16:33 +0000 (09:16 -0700)
* mv/commit-tree:
  t7603: add new testcases to ensure builtin-commit uses reduce_heads()
  builtin-commit: use commit_tree()
  commit_tree(): add a new author parameter

1  2 
builtin-merge.c

diff --cc builtin-merge.c
Simple merge