| commit | 0ddedd4d6b9b3e8eb3557d8ed28e1a0b354a25f8 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Dec 2014 22:31:39 +0000 (12 14:31 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 12 Dec 2014 22:31:39 +0000 (12 14:31 -0800) | ||
| tree | bec8ec6f7d910bce51a681bb81a601709d95c54a | treesnapshot (tar.gz zip) |
| parent | e886efdb342cee6722762e654ddc1fdee37315b5 | commitdiff |
| parent | 1e86d5b11dcf31adf11363caa1e96a94612b16f4 | commitdiff |
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
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