diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-10-17 11:40:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-10-17 11:40:15 -0700 |
| commit | 1e0a3e8f8f9e160b21fbe6f3f11a11dbed15fb4e (patch) | |
| tree | f72301557649cd895d16b15bce21ef6b47fb36ca /xdiff-interface.h | |
| parent | Git 2.51 (diff) | |
| parent | diff: ensure consistent diff behavior with ignore options (diff) | |
| download | git-1e0a3e8f8f9e160b21fbe6f3f11a11dbed15fb4e.tar.gz git-1e0a3e8f8f9e160b21fbe6f3f11a11dbed15fb4e.zip | |
Merge branch 'ly/diff-name-only-with-diff-from-content' into jk/diff-from-contents-fix
* ly/diff-name-only-with-diff-from-content:
diff: ensure consistent diff behavior with ignore options
Diffstat (limited to 'xdiff-interface.h')
| -rw-r--r-- | xdiff-interface.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xdiff-interface.h b/xdiff-interface.h index 1ed430b622..dfc55daddf 100644 --- a/xdiff-interface.h +++ b/xdiff-interface.h @@ -28,9 +28,9 @@ * from an error internal to xdiff, xdiff itself will see that * non-zero return and translate it to -1. * - * See "diff_grep" in diffcore-pickaxe.c for a trick to work around - * this, i.e. using the "consume_callback_data" to note the desired - * early return. + * See "diff_grep" in diffcore-pickaxe.c and "quick_consume" in diff.c + * for a trick to work around this, i.e. using the "consume_callback_data" + * to note the desired early return. */ typedef int (*xdiff_emit_line_fn)(void *, char *, unsigned long); typedef void (*xdiff_emit_hunk_fn)(void *data, |