summaryrefslogtreecommitdiff
path: root/builtin/push.c
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2014-11-21 01:20:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-11-21 19:27:53 (GMT)
commit98a260220c9b464dbefce1a23e4c89ed7b6ccb4d (patch)
treee99aafb811a087dd8a7c17654eb6695bd5bb856b /builtin/push.c
parentc41d3fedd8a5dec2c2c991822b70b91c50ca047e (diff)
downloadgit-98a260220c9b464dbefce1a23e4c89ed7b6ccb4d.zip
git-98a260220c9b464dbefce1a23e4c89ed7b6ccb4d.tar.gz
git-98a260220c9b464dbefce1a23e4c89ed7b6ccb4d.tar.bz2
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>
Diffstat (limited to 'builtin/push.c')
0 files changed, 0 insertions, 0 deletions