| commit | 98a260220c9b464dbefce1a23e4c89ed7b6ccb4d | |
| author | David Aguilar <davvid@gmail.com> | |
| Fri, 21 Nov 2014 01:20:29 +0000 (20 17:20 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 21 Nov 2014 19:27:53 +0000 (21 11:27 -0800) | ||
| tree | e99aafb811a087dd8a7c17654eb6695bd5bb856b | treesnapshot (tar.gz zip) |
| parent | c41d3fedd8a5dec2c2c991822b70b91c50ca047e | commitdiff |
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>
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 | diffblobblamehistory |