diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2017-12-27 17:18:35 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-12-27 12:38:35 -0800 |
| commit | 06dba2b0235293e84157a59fa22dc89baa336166 (patch) | |
| tree | 05d6f234f4b54b19435c021a279155dd68e1f5e6 /git-merge-octopus.sh | |
| parent | 6de5aafdd12104df3d10ef54ac74723a41174290 (diff) | |
| download | git-06dba2b0235293e84157a59fa22dc89baa336166.tar.gz | |
Use DIFF_DETECT_RENAME for detect_rename assignments
This field can have two values (2 for copy). Use this name instead for
clarity. Many places have already used this constant.
Note, the detect_rename assignments in merge-recursive.c remain
unchanged because it's actually a boolean there.
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 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions