diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-11-21 11:17:57 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-11-21 11:27:37 -0800 |
commit | e00e13e2aa5e94dc77dedb8f2026198300c7c8fe (patch) | |
tree | d7c3b9fbe2d850540eb4dfe12dd99cd40dc23701 /git-gui/.gitattributes | |
parent | Merge branch 'da/difftool' (diff) | |
download | tgif-e00e13e2aa5e94dc77dedb8f2026198300c7c8fe.tar.xz |
mergetool--lib: remove no-op assignment to $status from setup_user_tool
Even though setup_user_tool assigns the exit status from "eval
$merge_tool_cmd" to $status, the variable is overwritten by the
function it calls next, check_unchanged, without ever getting looked
at by anybody. And "return $status" at the end of this function
returns the value check_unchanged assigned to it (which is the same
as the value the function returns). Which makes the assignment a
no-op.
Remove it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-gui/.gitattributes')
0 files changed, 0 insertions, 0 deletions