projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: f0531a2) | patch
merge_file(): add comment explaining behavior wrt conflict style
authorJonathan Nieder <jrnieder@gmail.com>
Sun, 21 Mar 2010 00:40:53 +0000 (19:40 -0500)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Mar 2010 03:36:11 +0000 (20:36 -0700)
commite44b3851c9d5fc840e8f33fb76f473a71b658d10
treeda50f45ea04117bb754b9c526a0be7f90f9fd9e3tree | snapshot
parentf0531a2937e919e763ab05e9800aef51658104fccommit | diff
merge_file(): add comment explaining behavior wrt conflict style

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: Jonathan Nieder <jrnieder@mgila.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
merge-file.c diff | blob | history
Git—the stupid content tracker