git p4 test: rename some "git-p4 command" strings
[gitweb.git] / t / t1200-tutorial.sh
index 5e29e13782ffad74915128adf163d57eef16f4e8..397ccb690908dad2d45bab3d249f9c62f2dc91d1 100755 (executable)
@@ -154,9 +154,9 @@ test_expect_success 'git show-branch' '
 cat > resolve.expect << EOF
 Updating VARIABLE..VARIABLE
 FASTFORWARD (no commit created; -m option ignored)
- example |    1 +
- hello   |    1 +
- 2 files changed, 2 insertions(+), 0 deletions(-)
+ example | 1 +
+ hello   | 1 +
+ 2 files changed, 2 insertions(+)
 EOF
 
 test_expect_success 'git resolve' '