diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-22 09:35:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-22 09:35:36 -0700 |
| commit | 262657dce61b417d712a7f4cd85ff8ff4c6ec3a4 (patch) | |
| tree | 1074778dccb10ef6cfe3a63d2a0d6b21dded3d34 /t/t7005-editor.sh | |
| parent | 6df2ffaeef3f593214e88d9c148a7f3504f13e5e (diff) | |
| parent | a4c24549acf16f7917ea3ddd811c6c61afc5689c (diff) | |
| download | git-262657dce61b417d712a7f4cd85ff8ff4c6ec3a4.tar.gz | |
Merge branch 'maint'
* maint:
Update draft release notes to 1.7.1.1
tests: remove unnecessary '^' from 'expr' regular expression
Conflicts:
diff.c
Diffstat (limited to 't/t7005-editor.sh')
| -rwxr-xr-x | t/t7005-editor.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t7005-editor.sh b/t/t7005-editor.sh index 25b6d2e67c..fe60d699a3 100755 --- a/t/t7005-editor.sh +++ b/t/t7005-editor.sh @@ -13,7 +13,7 @@ test_expect_success 'determine default editor' ' ' -if ! expr "$vi" : '^[a-z]*$' >/dev/null +if ! expr "$vi" : '[a-z]*$' >/dev/null then vi= fi |