Merge branch 'mm/status-porcelain-format-i18n-fix'

diff --git a/t/t4018/cpp-template-function-definition b/t/t4018/cpp-template-function-definition
index a410298b0b2ed5084910f1c906def7cfebc428a8..0cdf5ba5bd439156063d686d5faa31184cc697e6 100644 (file)
--- a/t/t4018/cpp-template-function-definition
+++ b/t/t4018/cpp-template-function-definition
@@ -1,5 +1,4 @@
 template<class T> int RIGHT(T arg)
 {
        ChangeMe;
-       broken;
 }