summaryrefslogtreecommitdiff
path: root/t/t4100/t-apply-9.expect
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/t4100/t-apply-9.expect
parent0ad9e96d2e2f42f4d2ce7cd612bf741913242bc0 (diff)
parent25a7850a106ed0f27b88b8ce0b89fd326120dff4 (diff)
downloadgit-508d1244dc8d38188c70e98207efa8a97d16b47c.tar.gz
Merge branch 'master' into git-po
Diffstat (limited to 't/t4100/t-apply-9.expect')
-rw-r--r--t/t4100/t-apply-9.expect2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4100/t-apply-9.expect b/t/t4100/t-apply-9.expect
index eef7f2e65c..55a55c3cc7 100644
--- a/t/t4100/t-apply-9.expect
+++ b/t/t4100/t-apply-9.expect
@@ -1,2 +1,2 @@
t/t4100-apply-stat.sh | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
+ 1 file changed, 1 insertion(+), 1 deletion(-)