8000 Merge branch '3.4' into 4.0 · dunglas/symfony@fba1722 · GitHub
[go: up one dir, main page]
8000
Skip to content

Commit fba1722

Browse files
nicolas-grekasnicolas-grekas
committed
Merge branch '3.4' into 4.0
* 3.4: fix merge
2 parents 6a69c7f + 3b8ca1a commit fba1722

5 files changed

+5
-5
lines changed

‎src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
In ApplicationTest.php line 715:
2+
In ApplicationTest.php line 725:
33

44
エラーメッセージ
55

‎src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth1decorated.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
In ApplicationTest.php line 715:
2+
In ApplicationTest.php line 725:
33
 
44
 エラーメッセージ 
55
 

‎src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_doublewidth2.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
In ApplicationTest.php line 729:
2+
In ApplicationTest.php line 739:
33

44
コマンドの実行中にエラーが
55
発生しました。

‎src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_escapeslines.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
In ApplicationTest.php line 743:
2+
In ApplicationTest.php line 753:
33

44
dont break here <
55
info>!</info>

‎src/Symfony/Component/Console/Tests/Fixtures/application_renderexception_linebreaks.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
In ApplicationTest.php line 760:
2+
In ApplicationTest.php line 770:
33

44
line 1 with extra spaces
55
line 2

0 commit comments

Comments
 (0)
0