diff options
| author | Pavel Roskin <proski@gnu.org> | 2007-02-03 23:49:16 -0500 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2007-02-03 21:49:54 -0800 |
| commit | 3dff5379bf1e3fda5e5a84ca5813b0c0cfd51be7 (patch) | |
| tree | 86fe6fa503b65e19b37dceb5b7613602267a9bb1 /t/t1004-read-tree-m-u-wf.sh | |
| parent | 0f3908758947b2279f5d2d4a294653d76a62d468 (diff) | |
| download | git-3dff5379bf1e3fda5e5a84ca5813b0c0cfd51be7.tar.gz git-3dff5379bf1e3fda5e5a84ca5813b0c0cfd51be7.tar.xz | |
Assorted typo fixes
Signed-off-by: Junio C Hamano <junkio@cox.net>
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 4f664f6ad..c11420a8b 100755 --- a/t/t1004-read-tree-m-u-wf.sh +++ b/t/t1004-read-tree-m-u-wf.sh @@ -87,7 +87,7 @@ test_expect_success 'three-way not complaining on an untracked path in both' ' git-read-tree -m -u branch-point master side ' -test_expect_success 'three-way not cloberring a working tree file' ' +test_expect_success 'three-way not clobbering a working tree file' ' git reset --hard && rm -f file2 subdir/file2 file3 subdir/file3 && |