diff options
| author | Gerrit Pape <pape@smarden.org> | 2005-12-28 12:25:38 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2005-12-28 20:09:53 +0100 |
| commit | f1ec72ba1e52783179a7da7defaab0458c895617 (patch) | |
| tree | 05623adb92c7e54a96e92186d36a6aa21b9fdcdc /Documentation/git-diff.txt | |
| parent | Do not mark tags fetched via --tags flag as mergeable (diff) | |
| download | git-f1ec72ba1e52783179a7da7defaab0458c895617.tar.xz git-f1ec72ba1e52783179a7da7defaab0458c895617.zip | |
Fix skipping merge-order test with NO_OPENSSL=1.
Move git-rev-list --merge-order usage check for 'OpenSSL not linked' after
test 1; we cannot trigger this unless we try to actually use --merge-order
by giving some ref, and we do not have any ref until we run the first test
to create commits.
Signed-off-by: Gerrit Pape <pape@smarden.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-diff.txt')
0 files changed, 0 insertions, 0 deletions