Andrew's git / gitweb.git / diff
?
mergetool: simplify conditionals
authorDavid Aguilar <davvid@gmail.com>
Fri, 21 Nov 2014 01:20:29 +0000 (17:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Nov 2014 19:27:53 +0000 (11:27 -0800)
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>
No differences found