David Aguilar 98a260220c 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>

2014-11-21 11:27:53 -08:00

9.1 KiB

Executable File

Raw Blame History

View Raw