aboutsummaryrefslogtreecommitdiff
path: root/t/t4014-format-patch.sh
diff options
context:
space:
mode:
authorJiang Xin <worldhello.net@gmail.com>2012-02-28 12:23:26 +0800
committerJiang Xin <worldhello.net@gmail.com>2012-02-28 12:23:26 +0800
commit508d1244dc8d38188c70e98207efa8a97d16b47c (patch)
treefc8688b80be453755f8135df11bf1db2d247725a /t/t4014-format-patch.sh
parent0ad9e96d2e2f42f4d2ce7cd612bf741913242bc0 (diff)
parent25a7850a106ed0f27b88b8ce0b89fd326120dff4 (diff)
downloadgit-508d1244dc8d38188c70e98207efa8a97d16b47c.tar.gz
git-508d1244dc8d38188c70e98207efa8a97d16b47c.tar.xz
Merge branch 'master' into git-po
Diffstat (limited to 't/t4014-format-patch.sh')
-rwxr-xr-xt/t4014-format-patch.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh
index 67975129b..7dfe716cf 100755
--- a/t/t4014-format-patch.sh
+++ b/t/t4014-format-patch.sh
@@ -520,7 +520,7 @@ test_expect_success 'shortlog of cover-letter wraps overly-long onelines' '
cat > expect << EOF
---
file | 16 ++++++++++++++++
- 1 files changed, 16 insertions(+), 0 deletions(-)
+ 1 file changed, 16 insertions(+)
diff --git a/file b/file
index 40f36c6..2dc5c23 100644