diff options
| author | Felipe Contreras <felipe.contreras@gmail.com> | 2009-10-24 11:31:32 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-24 23:50:28 -0700 |
| commit | a75d7b54097ef0d0945cbe673a9940d6c561f95c (patch) | |
| tree | 40d03cbf093fd503448d31d3a71319be3f1d4fac /t/t1001-read-tree-m-2way.sh | |
| parent | 78d553b7d7b269bb22ebd8b1198657c37484a3a0 (diff) | |
| download | git-a75d7b54097ef0d0945cbe673a9940d6c561f95c.tar.gz | |
Use 'fast-forward' all over the place
It's a compound word.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t1001-read-tree-m-2way.sh')
| -rwxr-xr-x | t/t1001-read-tree-m-2way.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/t/t1001-read-tree-m-2way.sh b/t/t1001-read-tree-m-2way.sh index 271bc4e17f..c2d408b461 100755 --- a/t/t1001-read-tree-m-2way.sh +++ b/t/t1001-read-tree-m-2way.sh @@ -5,7 +5,7 @@ test_description='Two way merge with read-tree -m $H $M -This test tries two-way merge (aka fast forward with carry forward). +This test tries two-way merge (aka fast-forward with carry forward). There is the head (called H) and another commit (called M), which is simply ahead of H. The index and the work tree contains a state that @@ -51,7 +51,7 @@ check_cache_at () { } cat >bozbar-old <<\EOF -This is a sample file used in two-way fast forward merge +This is a sample file used in two-way fast-forward merge tests. Its second line ends with a magic word bozbar which will be modified by the merged head to gnusto. It has some extra lines so that external tools can @@ -300,7 +300,7 @@ test_expect_success \ echo gnusto gnusto >bozbar && if read_tree_twoway $treeH $treeM; then false; else :; fi' -# This fails with straight two-way fast forward. +# This fails with straight two-way fast-forward. test_expect_success \ '22 - local change cache updated.' \ 'rm -f .git/index && |