diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:41:02 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-11-15 16:41:02 -0800 |
| commit | 4d8c3258880548510b1d23f0db517adb7dfd2486 (patch) | |
| tree | eeb42aefe5555624063221d7ddc28a29f598ce7f /t/t6028-merge-up-to-date.sh | |
| parent | 9fa51ff940d41c7bbacf91b81d860d4c18b9ee1e (diff) | |
| parent | a75d7b54097ef0d0945cbe673a9940d6c561f95c (diff) | |
| download | git-4d8c3258880548510b1d23f0db517adb7dfd2486.tar.gz git-4d8c3258880548510b1d23f0db517adb7dfd2486.tar.xz | |
Merge branch 'fc/doc-fast-forward'
* fc/doc-fast-forward:
Use 'fast-forward' all over the place
Conflicts:
builtin-merge.c
Diffstat (limited to 't/t6028-merge-up-to-date.sh')
| -rwxr-xr-x | t/t6028-merge-up-to-date.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t6028-merge-up-to-date.sh b/t/t6028-merge-up-to-date.sh index f8f3e3ff2..a91644e3b 100755 --- a/t/t6028-merge-up-to-date.sh +++ b/t/t6028-merge-up-to-date.sh @@ -1,6 +1,6 @@ #!/bin/sh -test_description='merge fast forward and up to date' +test_description='merge fast-forward and up to date' . ./test-lib.sh |