mergetool--lib: remove use of $status global
commit1b6a53431c0ffba4fb2428ef09018a5e889f52f8
authorDavid Aguilar <davvid@gmail.com>
Fri, 21 Nov 2014 01:20:27 +0000 (20 17:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Nov 2014 19:27:53 +0000 (21 11:27 -0800)
treef5e961cfa058c42e03ae38c2a38de6fc4a08f8ae
parente00e13e2aa5e94dc77dedb8f2026198300c7c8fe
mergetool--lib: remove use of $status global

Remove return statements and rework check_unchanged() so that the exit
status from the last evaluated expression bubbles up to the callers.

Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-mergetool--lib.sh