aboutsummaryrefslogtreecommitdiff
path: root/convert.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-04-21 00:05:31 -0700
committerJunio C Hamano <junkio@cox.net>2007-04-21 00:05:31 -0700
commite87b1c943a50af9ab51df20b3419cbffa4e75484 (patch)
tree178e42250704ebfe685bed5a3592c41fb013ddca /convert.c
parentac78e548049f4e86b38368d2c4b4dbb546c64ac6 (diff)
downloadgit-e87b1c943a50af9ab51df20b3419cbffa4e75484.tar.gz
git-e87b1c943a50af9ab51df20b3419cbffa4e75484.tar.xz
Fix bogus linked-list management for user defined merge drivers.
ll_user_merge_tail is supposed to point at the pointer to be updated to point at a newly created item. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'convert.c')
0 files changed, 0 insertions, 0 deletions