Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge conflict markers in ssh_config.5 #149

Closed
vt-alt opened this issue Nov 24, 2023 · 1 comment
Closed

Merge conflict markers in ssh_config.5 #149

vt-alt opened this issue Nov 24, 2023 · 1 comment

Comments

@vt-alt
Copy link

vt-alt commented Nov 24, 2023

There are garbage (merge conflict markers) in ssh_config.5 man page at:

$ grep -n -e '<<<<<<<' -e '>>>>>>>' -e '=======' ssh_config.5
36:<<<<<<< HEAD
39:=======
42:>>>>>>> V_8_9_P1
390:<<<<<<< HEAD
393:=======
398:>>>>>>> V_8_9_P1
892:<<<<<<< HEAD
894:=======
895:>>>>>>> V_8_9_P1
900:<<<<<<< HEAD
902:=======
904:>>>>>>> V_8_9_P1
946:<<<<<<< HEAD
948:=======
949:>>>>>>> V_8_9_P1
954:<<<<<<< HEAD
956:=======
958:>>>>>>> V_8_9_P1
1537:<<<<<<< HEAD
1539:=======
1540:>>>>>>> V_8_9_P1
1545:<<<<<<< HEAD
1547:=======
1549:>>>>>>> V_8_9_P1
2132:<<<<<<< HEAD
2134:=======
2136:>>>>>>> V_8_9_P1

Perhaps result of unresolved merge conflicts. With them page looks like this:

SSH_CONFIG(5)               BSD File Formats Manual               SSH_CONFIG(5)

<<<<<<< HEAD ======= >>>>>>> V_8_9_P1

NAME
     ssh_config -- OpenSSH client configuration file

DESCRIPTION
     ssh(1) obtains configuration data from the following sources in the fol-
@geedo0
Copy link

geedo0 commented Jul 29, 2024

This was fixed in PR #159.

https://github.com/open-quantum-safe/openssh/blob/OQS-v9/ssh_config.5

@geedo0 geedo0 closed this as completed Aug 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants