diff options
| author |  Tanay Abhra <tanayabh@gmail.com> | 2014-08-13 01:22:01 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2014-08-13 12:37:41 -0700 |
| commit | 0e7bcb1b00179113c0cccb8f2f4768d41cf6fff2 (patch) | |
| tree | b23cafce8c065f304fac7fcaf951c40ac2a1e480 /t/t3507-cherry-pick-conflict.sh | |
| parent | ll-merge.c: refactor `read_merge_config()` to use `git_config_string()` (diff) | |
| download | tgif-0e7bcb1b00179113c0cccb8f2f4768d41cf6fff2.tar.xz | |
merge-recursive.c: replace `git_config()` with `git_config_get_int()`
Use `git_config_get_int()` instead of `git_config()` to take advantage
of the config-set API which provides a cleaner control flow.
Signed-off-by: Tanay Abhra <tanayabh@gmail.com>
Reviewed-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t3507-cherry-pick-conflict.sh')
0 files changed, 0 insertions, 0 deletions