diff options
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 7347b73..19c31d4 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -663,9 +663,6 @@ static int git_merge_config(const char *k, const char *v, void *cb) status = fmt_merge_msg_config(k, v, cb); if (status) return status; - status = git_gpg_config(k, v, NULL); - if (status) - return status; return git_diff_ui_config(k, v, cb); } |