summaryrefslogtreecommitdiff
path: root/t/t6026-merge-attr.sh
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2008-09-05 19:26:42 +0200
committerJunio C Hamano <gitster@pobox.com>2008-09-05 11:57:54 -0700
commita6f63ae002237c2eb416d4e2cb43227522e4ea9a (patch)
tree349b6bc498a17414840555ff8e4713c7fe347407 /t/t6026-merge-attr.sh
parent696ee23cc1817a5064780600374589d3a773a081 (diff)
downloadgit-a6f63ae002237c2eb416d4e2cb43227522e4ea9a.tar.gz
merge-recursive: get rid of virtual_id
We now just leave the object->sha1 field of virtual commits 0{40} as it is initialized, as a unique hash is not necessary in case of virtual commits. Signed-off-by: Miklos Vajna <vmiklos@frugalware.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6026-merge-attr.sh')
0 files changed, 0 insertions, 0 deletions