Merge branch 'mv/commit-tree'
commit1fa24f8f3d950b17ac15979c09b733c8e6f5c00c
authorShawn O. Pearce <spearce@spearce.org>
Thu, 25 Sep 2008 16:16:33 +0000 (25 09:16 -0700)
committerShawn O. Pearce <spearce@spearce.org>
Thu, 25 Sep 2008 16:16:33 +0000 (25 09:16 -0700)
treecd2c8c5995a42a407daabd1012d9b46faf180a9b
parent81b84bcbe3cc6a29a62fb1a69c68764ad6c0feeb
parent7a172b0dcb9d8ac2311a5c3f674f711476872e71
Merge branch 'mv/commit-tree'

* 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
builtin-merge.c