Merge git://github.com/git-l10n/git-po

diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh
index b90986c2c98dcf34390d06bd149b62097771e39b..121e38002bc73807649ebcc5df2799f6f35a9c67 100644 (file)
--- a/t/lib-git-p4.sh
+++ b/t/lib-git-p4.sh
@@ -24,6 +24,7 @@ P4DPORT=$((10669 + ($testid - $git_p4_test_start)))
 
 export P4PORT=localhost:$P4DPORT
 export P4CLIENT=client
+export P4EDITOR=:
 
 db="$TRASH_DIRECTORY/db"
 cli="$TRASH_DIRECTORY/cli"