From 925842af603bb803b1819a0f4aecb02d37feee46 Mon Sep 17 00:00:00 2001
From: Nguyen Xuan Quynh <nguyenxuanquynh2210vghy@gmail.com>
Date: Tue, 30 Oct 2018 16:30:34 +0700
Subject: [PATCH] Remove duplicate condition

---
 src/Symfony/Component/Console/Command/Command.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Symfony/Component/Console/Command/Command.php b/src/Symfony/Component/Console/Command/Command.php
index 796224b6a6..00df2d4454 100644
--- a/src/Symfony/Component/Console/Command/Command.php
+++ b/src/Symfony/Component/Console/Command/Command.php
@@ -303,14 +303,13 @@ class Command
 
         $this->definition->addOptions($this->application->getDefinition()->getOptions());
 
+        $this->applicationDefinitionMerged = true;
+
         if ($mergeArgs) {
             $currentArguments = $this->definition->getArguments();
             $this->definition->setArguments($this->application->getDefinition()->getArguments());
             $this->definition->addArguments($currentArguments);
-        }
 
-        $this->applicationDefinitionMerged = true;
-        if ($mergeArgs) {
             $this->applicationDefinitionMergedWithArgs = true;
         }
     }