resolve_gitlink_packed_ref(): fix mismerge
authorJunio C Hamano <gitster@pobox.com>
Mon, 17 Oct 2011 18:43:30 +0000 (11:43 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 17 Oct 2011 18:44:18 +0000 (11:44 -0700)
commite5fa45c...59241b609bce40fa7a8687796e4b941d
tree197f5b0...a39cc4030466089049cd815309509df1copy hash to clipboard (tree)
parent05f6edc...2a418a88eeb953d51408a6aeef312f5ccopy hash to clipboard (diff)
refs.c
t/t3000-ls-files-others.sh