Merge branch 'mv/merge-noff'
authorJunio C Hamano <gitster@pobox.com>
Sun, 19 Oct 2008 23:06:21 +0000 (16:06 -0700)
committerJunio C Hamano <gitster@pobox.com>
Sun, 19 Oct 2008 23:06:21 +0000 (16:06 -0700)
commit4f2d651e5b3414eac5d22ff47366d22c8cc289f6
tree1d6a6531fe0170679bfd193c4516e91c00cbb438
parentce6e5ff435f325769dd28980cf3c8b1625f194f2
parentcf10f9fdd5e673a163847f0e931ce9731507e03b
Merge branch 'mv/merge-noff'

* mv/merge-noff:
  builtin-commit: use reduce_heads() only when appropriate

Conflicts:
builtin-commit.c
t/t7600-merge.sh
builtin-commit.c
builtin-merge.c
t/t7600-merge.sh