diff options
| author | Miklos Vajna <vmiklos@frugalware.org> | 2008-09-10 22:10:32 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-09-10 16:11:00 -0700 |
| commit | 6bb6b0341af26739ba305b20c62a433f15029049 (patch) | |
| tree | cd737ea324f4e54574a69631889232a42f85f650 /t/t7603-merge-reduce-heads.sh | |
| parent | ee20a129de6f332da092e93feb2dd5f8330f9bc0 (diff) | |
| download | git-6bb6b0341af26739ba305b20c62a433f15029049.tar.gz git-6bb6b0341af26739ba305b20c62a433f15029049.tar.xz | |
builtin-commit: use commit_tree()
First, it adds less code than removes, second this allows us to use
recuce_heads() for parents, so that the parents of a merge will be
always the same with or without a conflict.
Signed-off-by: Miklos Vajna <vmiklos@frugalware.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7603-merge-reduce-heads.sh')
0 files changed, 0 insertions, 0 deletions