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)
* mv/merge-noff:
builtin-commit: use reduce_heads() only when appropriate

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

No differences found