diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2018-09-21 17:57:27 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-09-21 09:48:10 -0700 |
| commit | 32eaa4688387d37398f0bc498335355a28efb0c7 (patch) | |
| tree | cef97cc234d7958b4c20d34e272baacdcc15ca48 /diff.c | |
| parent | diff-lib.c: remove implicit dependency on the_index (diff) | |
| download | git-32eaa4688387d37398f0bc498335355a28efb0c7.tar.gz git-32eaa4688387d37398f0bc498335355a28efb0c7.zip | |
ll-merge.c: remove implicit dependency on the_index
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3637,7 +3637,7 @@ static void builtin_checkdiff(const char *name_a, const char *name_b, data.lineno = 0; data.o = o; data.ws_rule = whitespace_rule(attr_path); - data.conflict_marker_size = ll_merge_marker_size(attr_path); + data.conflict_marker_size = ll_merge_marker_size(o->repo->index, attr_path); if (fill_mmfile(o->repo, &mf1, one) < 0 || fill_mmfile(o->repo, &mf2, two) < 0) |