diff options
| author | David Aguilar <davvid@gmail.com> | 2014-11-20 17:20:29 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-21 11:27:53 -0800 |
| commit | 98a260220c9b464dbefce1a23e4c89ed7b6ccb4d (patch) | |
| tree | e99aafb811a087dd8a7c17654eb6695bd5bb856b /mergetools/emerge | |
| parent | c41d3fedd8a5dec2c2c991822b70b91c50ca047e (diff) | |
| download | git-98a260220c9b464dbefce1a23e4c89ed7b6ccb4d.tar.gz git-98a260220c9b464dbefce1a23e4c89ed7b6ccb4d.tar.xz | |
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 'mergetools/emerge')
0 files changed, 0 insertions, 0 deletions