summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-12 22:31:39 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-12-12 22:31:39 (GMT)
commit0ddedd4d6b9b3e8eb3557d8ed28e1a0b354a25f8 (patch)
treebec8ec6f7d910bce51a681bb81a601709d95c54a /builtin
parente886efdb342cee6722762e654ddc1fdee37315b5 (diff)
parent1e86d5b11dcf31adf11363caa1e96a94612b16f4 (diff)
downloadgit-0ddedd4d6b9b3e8eb3557d8ed28e1a0b354a25f8.zip
git-0ddedd4d6b9b3e8eb3557d8ed28e1a0b354a25f8.tar.gz
git-0ddedd4d6b9b3e8eb3557d8ed28e1a0b354a25f8.tar.bz2
Merge branch 'da/difftool-mergetool-simplify-reporting-status'
Code simplification. * da/difftool-mergetool-simplify-reporting-status: mergetools: stop setting $status in merge_cmd() mergetool: simplify conditionals difftool--helper: add explicit exit statement mergetool--lib: remove use of $status global mergetool--lib: remove no-op assignment to $status from setup_user_tool
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions