diff options
| author | Ezekiel Newren <ezekielnewren@gmail.com> | 2025-09-26 22:41:57 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-09-30 14:12:46 -0700 |
| commit | b7de64a6d6f58953a0c1dc7ff34f7080b3e38b37 (patch) | |
| tree | b686a24e7f3f2a9eafece19c225204e6fbf5e787 /xdiff/xutils.c | |
| parent | xdiff: delete chastore from xdfile_t (diff) | |
| download | git-b7de64a6d6f58953a0c1dc7ff34f7080b3e38b37.tar.gz git-b7de64a6d6f58953a0c1dc7ff34f7080b3e38b37.zip | |
xdiff: rename rchg -> changed in xdfile_t
The field rchg (now 'changed') declares if a line in a file is changed
or not. A later commit will change it's type from 'char' to 'bool'
to make its purpose even more clear.
Best-viewed-with: --color-words
Signed-off-by: Ezekiel Newren <ezekielnewren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '')
| -rw-r--r-- | xdiff/xutils.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xdiff/xutils.c b/xdiff/xutils.c index 332982b509..ed65c222e6 100644 --- a/xdiff/xutils.c +++ b/xdiff/xutils.c @@ -425,8 +425,8 @@ int xdl_fall_back_diff(xdfenv_t *diff_env, xpparam_t const *xpp, if (xdl_do_diff(&subfile1, &subfile2, xpp, &env) < 0) return -1; - memcpy(diff_env->xdf1.rchg + line1 - 1, env.xdf1.rchg, count1); - memcpy(diff_env->xdf2.rchg + line2 - 1, env.xdf2.rchg, count2); + memcpy(diff_env->xdf1.changed + line1 - 1, env.xdf1.changed, count1); + memcpy(diff_env->xdf2.changed + line2 - 1, env.xdf2.changed, count2); xdl_free_env(&env); |