diff options
| author | Junio C Hamano <gitster@pobox.com> | 2007-07-03 07:52:14 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-03 07:52:14 +0200 |
| commit | 5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3 (patch) | |
| tree | 9f68d81a31f8dfe7af6096e7beac2dc0997c143a /t/t1004-read-tree-m-u-wf.sh | |
| parent | Start deprecating "git-command" in favor of "git command" (diff) | |
| download | git-5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3.tar.xz git-5be60078c935ed08ee8eb5a32680bdfb6bb5bdf3.zip | |
Rewrite "git-frotz" to "git frotz"
This uses the remove-dashes target to replace "git-frotz" to "git frotz".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1004-read-tree-m-u-wf.sh')
| -rwxr-xr-x | t/t1004-read-tree-m-u-wf.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh index c11420a8b6..d609a551ae 100755 --- a/t/t1004-read-tree-m-u-wf.sh +++ b/t/t1004-read-tree-m-u-wf.sh @@ -84,7 +84,7 @@ test_expect_success 'three-way not complaining on an untracked path in both' ' echo >file2 file two is untracked on the master side && echo >subdir/file2 file two is untracked on the master side && - git-read-tree -m -u branch-point master side + git read-tree -m -u branch-point master side ' test_expect_success 'three-way not clobbering a working tree file' ' |