diff options
| author |  Josh Steadmon <steadmon@google.com> | 2021-12-20 19:30:24 -0800 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-12-20 22:40:21 -0800 |
| commit | 44f14a9d24cd9f04a0a789e58968d52d44d7f332 (patch) | |
| tree | fc90a36b89a50e4312a52f052e01ece104accf12 /builtin/merge-file.c | |
| parent | branch: add flags and config to inherit tracking (diff) | |
| download | tgif-44f14a9d24cd9f04a0a789e58968d52d44d7f332.tar.xz | |
config: require lowercase for branch.*.autosetupmerge
Although we only documented that branch.*.autosetupmerge would accept
"always" as a value, the actual implementation would accept any
combination of upper- or lower-case. Fix this to be consistent with
documentation and with other values of this config variable.
Signed-off-by: Josh Steadmon <steadmon@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-file.c')
0 files changed, 0 insertions, 0 deletions