diff options
| author |  Sergey Organov <sorganov@gmail.com> | 2021-04-13 14:41:14 +0300 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-04-16 23:38:35 -0700 |
| commit | 4320815eb9a002b4ee64f70dda9b1c1e019f4894 (patch) | |
| tree | 7ab4f888b1111caf6d8889766351e80e58b9fc24 /t/t4135/git-with backslash.diff | |
| parent | Makefile: add missing dependencies of 'config-list.h' (diff) | |
| download | tgif-4320815eb9a002b4ee64f70dda9b1c1e019f4894.tar.xz | |
diff-merges: introduce --diff-merges=on
Introduce the notion of default diff format for merges, and the option
"on" to select it. The default format is "separate" and can't yet
be changed, so effectively "on" is just a synonym for "separate"
for now. Add corresponding test to t4013.
This is in preparation for introducing log.diffMerges configuration
option that will let --diff-merges=on to be configured to any
supported format.
Signed-off-by: Sergey Organov <sorganov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4135/git-with backslash.diff')
0 files changed, 0 insertions, 0 deletions