]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c41d3fe) | patch
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)
commit98a260220c9b464dbefce1a23e4c89ed7b6ccb4d
treee99aafb811a087dd8a7c17654eb6695bd5bb856btree | snapshot
parentc41d3fedd8a5dec2c2c991822b70b91c50ca047ecommit | diff
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>
git-mergetool.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.