diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-03-20 19:40:53 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-20 20:36:11 -0700 |
| commit | e44b3851c9d5fc840e8f33fb76f473a71b658d10 (patch) | |
| tree | da50f45ea04117bb754b9c526a0be7f90f9fd9e3 /merge-recursive.h | |
| parent | f0531a2937e919e763ab05e9800aef51658104fc (diff) | |
| download | git-e44b3851c9d5fc840e8f33fb76f473a71b658d10.tar.gz | |
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>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions