| commit | e87b1c943a50af9ab51df20b3419cbffa4e75484 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sat, 21 Apr 2007 07:05:31 +0000 (21 00:05 -0700) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sat, 21 Apr 2007 07:05:31 +0000 (21 00:05 -0700) | ||
| tree | 178e42250704ebfe685bed5a3592c41fb013ddca | treesnapshot (tar.gz zip) |
| parent | ac78e548049f4e86b38368d2c4b4dbb546c64ac6 | commitdiff |
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>
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>
| merge-recursive.c | diffblobblamehistory |