From: David Aguilar <davvid@gmail.com>
Date: Fri, 21 Nov 2014 01:20:29 +0000 (-0800)
Subject: mergetool: simplify conditionals
X-Git-Tag: v2.3.0-rc0~83^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/98a260220c9b464dbefce1a23e4c89ed7b6ccb4d?hp=98a260220c9b464dbefce1a23e4c89ed7b6ccb4d

mergetool: simplify conditionals

Combine the $last_status checks into a single conditional.
Replace $last_status and $rollup_status with a single variable.

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