-
由 Jonathan Nieder 提交于
The merge_file() function is a helper for ‘git read-tree’, which does not respect the merge.conflictstyle option, so there is no need to worry about what ancestor_name it should pass to ll_merge(). Add a comment to this effect. Signed-off-by: NJonathan Nieder <jrnieder@mgila.com> Signed-off-by: NJunio C Hamano <gitster@pobox.com>
e44b3851