比较文本

查找两个文本文件之间的差异

Real-time diff

Unified diff

Collapse lines

Highlight change

Syntax highlighting

工具

Diffchecker Desktop The most secure way to run Diffchecker. Get the Diffchecker Desktop app: your diffs never leave your computer!Get Desktop

gitlab diff vpn

Created 5 years agoDiff never expires

14 removals

66 lines

13 additions

65 lines

OpenSSH_7.9p1, LibreSSL 2.7.3

debug1: Reading configuration data /Users/stephane/.ssh/config

debug1: /Users/stephane/.ssh/config line 1: Applying options for gitlab.com

debug1: Reading configuration data /etc/ssh/ssh_config

debug1: /etc/ssh/ssh_config line 48: Applying options for *

debug1: Connecting to altssh.gitlab.com [35.190.168.187] port 443.

debug1: Connection established.

debug1: identity file /Users/stephane/.ssh/id_rsa type 0

debug1: identity file /Users/stephane/.ssh/id_rsa-cert type -1

debug1: Local version string SSH-2.0-OpenSSH_7.9

debug1: Remote protocol version 2.0, remote software version OpenSSH_7.2p2 Ubuntu-4ubuntu2.8

debug1: match: OpenSSH_7.2p2 Ubuntu-4ubuntu2.8 pat OpenSSH_7.0*,OpenSSH_7.1*,OpenSSH_7.2*,OpenSSH_7.3*,OpenSSH_7.4*,OpenSSH_7.5*,OpenSSH_7.6*,OpenSSH_7.7* compat 0x04000002

debug1: Authenticating to altssh.gitlab.com:443 as 'git'

debug1: SSH2_MSG_KEXINIT sent

debug1: SSH2_MSG_KEXINIT received

debug1: kex: algorithm: curve25519-sha256@libssh.org

debug1: kex: host key algorithm: ecdsa-sha2-nistp256

debug1: kex: server->client cipher: chacha20-poly1305@openssh.com MAC: <implicit> compression: none

debug1: kex: client->server cipher: chacha20-poly1305@openssh.com MAC: <implicit> compression: none

debug1: expecting SSH2_MSG_KEX_ECDH_REPLY

debug1: Server host key: ecdsa-sha2-nistp256 SHA256:xxx

debug1: Host '[altssh.gitlab.com]:443' is known and matches the ECDSA host key.

debug1: Found key in /Users/stephane/.ssh/known_hosts:2

debug1: rekey after 134217728 blocks

debug1: SSH2_MSG_NEWKEYS sent

debug1: expecting SSH2_MSG_NEWKEYS

debug1: SSH2_MSG_NEWKEYS received

debug1: rekey after 134217728 blocks

debug1: Will attempt key: /Users/stephane/.ssh/id_rsa RSA SHA256:bWVrpe/xxxx explicit agent

debug1: SSH2_MSG_EXT_INFO received

debug1: kex_input_ext_info: server-sig-algs=<rsa-sha2-256,rsa-sha2-512>

debug1: SSH2_MSG_SERVICE_ACCEPT received

debug1: Authentications that can continue: publickey

debug1: Next authentication method: publickey

debug1: Offering public key: /Users/stephane/.ssh/id_rsa RSA SHA256:bWVrpe/xxxxx explicit agent

debug1: Server accepts key: /Users/stephane/.ssh/id_rsa RSA SHA256:bWVrpe/xxxxx explicit agent

debug1: Authentication succeeded (publickey).

Authenticated to altssh.gitlab.com ([35.190.xx.xx]:443).

debug1: channel 0: new [client-session]

debug1: Requesting no-more-sessions@openssh.com

debug1: Entering interactive session.

debug1: pledge: network

debug1: client_input_global_request: rtype hostkeys-00@openssh.com want_reply 0

debug1: Remote: Forced command.

debug1: Remote: Port forwarding disabled.

debug1: Remote: X11 forwarding disabled.

debug1: Remote: Agent forwarding disabled.

debug1: Remote: PTY allocation disabled.

debug1: Remote: Forced command.

debug1: Remote: Port forwarding disabled.

debug1: Remote: X11 forwarding disabled.

debug1: Remote: Agent forwarding disabled.

debug1: Remote: PTY allocation disabled.

debug1: Sending environment.

debug1: Sending env LC_TERMINAL_VERSION = 3.3.7

debug1: Sending env LC_TERMINAL = iTerm2

debug1: Sending env LC_CTYPE = UTF-8

PTY allocation request failed on channel 0

debug1: client_input_channel_req: channel 0 rtype keepalive@openssh.com reply 1

Welcome to GitLab, @my_username!

debug1: client_input_channel_req: channel 0 rtype keepalive@openssh.com reply 1

debug1: client_input_channel_req: channel 0 rtype exit-status reply 0

debug1: client_input_channel_req: channel 0 rtype keepalive@openssh.com reply 1

debug1: client_input_channel_req: channel 0 rtype eow@openssh.com reply 0

debug1: channel 0: free: client-session, nchannels 1

Connection to altssh.gitlab.com closed.

Connection to altssh.gitlab.com closed by remote host.

Transferred: sent 3924, received 3588 bytes, in 0.2 seconds

Transferred: sent 3640, received 3488 bytes, in 120.3 seconds

Bytes per second: sent 17415.9, received 15924.6

Bytes per second: sent 30.3, received 29.0

debug1: Exit status 0

debug1: Exit status -1

已保存差异

原始文本

Open file

OpenSSH_7.9p1, LibreSSL 2.7.3
debug1: Reading configuration data /Users/stephane/.ssh/config
debug1: /Users/stephane/.ssh/config line 1: Applying options for gitlab.com
debug1: Reading configuration data /etc/ssh/ssh_config
debug1: /etc/ssh/ssh_config line 48: Applying options for *
debug1: Connecting to altssh.gitlab.com [35.190.168.187] port 443.
debug1: Connection established.
debug1: identity file /Users/stephane/.ssh/id_rsa type 0
debug1: identity file /Users/stephane/.ssh/id_rsa-cert type -1
debug1: Local version string SSH-2.0-OpenSSH_7.9
debug1: Remote protocol version 2.0, remote software version OpenSSH_7.2p2 Ubuntu-4ubuntu2.8
debug1: match: OpenSSH_7.2p2 Ubuntu-4ubuntu2.8 pat OpenSSH_7.0*,OpenSSH_7.1*,OpenSSH_7.2*,OpenSSH_7.3*,OpenSSH_7.4*,OpenSSH_7.5*,OpenSSH_7.6*,OpenSSH_7.7* compat 0x04000002
debug1: Authenticating to altssh.gitlab.com:443 as 'git'
debug1: SSH2_MSG_KEXINIT sent
debug1: SSH2_MSG_KEXINIT received
debug1: kex: algorithm: curve25519-sha256@libssh.org
debug1: kex: host key algorithm: ecdsa-sha2-nistp256
debug1: kex: server->client cipher: chacha20-poly1305@openssh.com MAC: <implicit> compression: none
debug1: kex: client->server cipher: chacha20-poly1305@openssh.com MAC: <implicit> compression: none
debug1: expecting SSH2_MSG_KEX_ECDH_REPLY
debug1: Server host key: ecdsa-sha2-nistp256 SHA256:xxx
debug1: Host '[altssh.gitlab.com]:443' is known and matches the ECDSA host key.
debug1: Found key in /Users/stephane/.ssh/known_hosts:2
debug1: rekey after 134217728 blocks
debug1: SSH2_MSG_NEWKEYS sent
debug1: expecting SSH2_MSG_NEWKEYS
debug1: SSH2_MSG_NEWKEYS received
debug1: rekey after 134217728 blocks
debug1: Will attempt key: /Users/stephane/.ssh/id_rsa RSA SHA256:bWVrpe/xxxx explicit agent
debug1: SSH2_MSG_EXT_INFO received
debug1: kex_input_ext_info: server-sig-algs=<rsa-sha2-256,rsa-sha2-512>
debug1: SSH2_MSG_SERVICE_ACCEPT received
debug1: Authentications that can continue: publickey
debug1: Next authentication method: publickey
debug1: Offering public key: /Users/stephane/.ssh/id_rsa RSA SHA256:bWVrpe/xxxxx explicit agent
debug1: Server accepts key: /Users/stephane/.ssh/id_rsa RSA SHA256:bWVrpe/xxxxx explicit agent
debug1: Authentication succeeded (publickey).
Authenticated to altssh.gitlab.com ([35.190.xx.xx]:443).
debug1: channel 0: new [client-session]
debug1: Requesting no-more-sessions@openssh.com
debug1: Entering interactive session.
debug1: pledge: network
debug1: client_input_global_request: rtype hostkeys-00@openssh.com want_reply 0
debug1: Remote: Forced command.
debug1: Remote: Port forwarding disabled.
debug1: Remote: X11 forwarding disabled.
debug1: Remote: Agent forwarding disabled.
debug1: Remote: PTY allocation disabled.
debug1: Remote: Forced command.
debug1: Remote: Port forwarding disabled.
debug1: Remote: X11 forwarding disabled.
debug1: Remote: Agent forwarding disabled.
debug1: Remote: PTY allocation disabled.
debug1: Sending environment.
debug1: Sending env LC_TERMINAL_VERSION = 3.3.7
debug1: Sending env LC_TERMINAL = iTerm2
debug1: Sending env LC_CTYPE = UTF-8
PTY allocation request failed on channel 0
Welcome to GitLab, @my_username!
debug1: client_input_channel_req: channel 0 rtype exit-status reply 0
debug1: client_input_channel_req: channel 0 rtype eow@openssh.com reply 0
debug1: channel 0: free: client-session, nchannels 1
Connection to altssh.gitlab.com closed.
Transferred: sent 3924, received 3588 bytes, in 0.2 seconds
Bytes per second: sent 17415.9, received 15924.6
debug1: Exit status 0

更改后文本

Open file

OpenSSH_7.9p1, LibreSSL 2.7.3
debug1: Reading configuration data /Users/stephane/.ssh/config
debug1: /Users/stephane/.ssh/config line 1: Applying options for gitlab.com
debug1: Reading configuration data /etc/ssh/ssh_config
debug1: /etc/ssh/ssh_config line 48: Applying options for *
debug1: Connecting to altssh.gitlab.com [35.190.168.187] port 443.
debug1: Connection established.
debug1: identity file /Users/stephane/.ssh/id_rsa type 0
debug1: identity file /Users/stephane/.ssh/id_rsa-cert type -1
debug1: Local version string SSH-2.0-OpenSSH_7.9
debug1: Remote protocol version 2.0, remote software version OpenSSH_7.2p2 Ubuntu-4ubuntu2.8
debug1: match: OpenSSH_7.2p2 Ubuntu-4ubuntu2.8 pat OpenSSH_7.0*,OpenSSH_7.1*,OpenSSH_7.2*,OpenSSH_7.3*,OpenSSH_7.4*,OpenSSH_7.5*,OpenSSH_7.6*,OpenSSH_7.7* compat 0x04000002
debug1: Authenticating to altssh.gitlab.com:443 as 'git'
debug1: SSH2_MSG_KEXINIT sent
debug1: SSH2_MSG_KEXINIT received
debug1: kex: algorithm: curve25519-sha256@libssh.org
debug1: kex: host key algorithm: ecdsa-sha2-nistp256
debug1: kex: server->client cipher: chacha20-poly1305@openssh.com MAC: <implicit> compression: none
debug1: kex: client->server cipher: chacha20-poly1305@openssh.com MAC: <implicit> compression: none
debug1: expecting SSH2_MSG_KEX_ECDH_REPLY
debug1: Server host key: ecdsa-sha2-nistp256 SHA256:xxx
debug1: Host '[altssh.gitlab.com]:443' is known and matches the ECDSA host key.
debug1: Found key in /Users/stephane/.ssh/known_hosts:2
debug1: rekey after 134217728 blocks
debug1: SSH2_MSG_NEWKEYS sent
debug1: expecting SSH2_MSG_NEWKEYS
debug1: SSH2_MSG_NEWKEYS received
debug1: rekey after 134217728 blocks
debug1: Will attempt key: /Users/stephane/.ssh/id_rsa RSA SHA256:bWVrpe/xxxx explicit agent
debug1: SSH2_MSG_EXT_INFO received
debug1: kex_input_ext_info: server-sig-algs=<rsa-sha2-256,rsa-sha2-512>
debug1: SSH2_MSG_SERVICE_ACCEPT received
debug1: Authentications that can continue: publickey
debug1: Next authentication method: publickey
debug1: Offering public key: /Users/stephane/.ssh/id_rsa RSA SHA256:bWVrpe/xxxxx explicit agent
debug1: Server accepts key: /Users/stephane/.ssh/id_rsa RSA SHA256:bWVrpe/xxxxx explicit agent
debug1: Authentication succeeded (publickey).
Authenticated to altssh.gitlab.com ([35.190.xx.xx]:443).
debug1: channel 0: new [client-session]
debug1: Requesting no-more-sessions@openssh.com
debug1: Entering interactive session.
debug1: pledge: network
debug1: client_input_global_request: rtype hostkeys-00@openssh.com want_reply 0
debug1: Remote: Forced command.
debug1: Remote: Port forwarding disabled.
debug1: Remote: X11 forwarding disabled.
debug1: Remote: Agent forwarding disabled.
debug1: Remote: PTY allocation disabled.
debug1: Remote: Forced command.
debug1: Remote: Port forwarding disabled.
debug1: Remote: X11 forwarding disabled.
debug1: Remote: Agent forwarding disabled.
debug1: Remote: PTY allocation disabled.
debug1: Sending environment.
debug1: Sending env LC_TERMINAL_VERSION = 3.3.7
debug1: Sending env LC_TERMINAL = iTerm2
debug1: Sending env LC_CTYPE = UTF-8
debug1: client_input_channel_req: channel 0 rtype keepalive@openssh.com reply 1
debug1: client_input_channel_req: channel 0 rtype keepalive@openssh.com reply 1
debug1: client_input_channel_req: channel 0 rtype keepalive@openssh.com reply 1
debug1: channel 0: free: client-session, nchannels 1
Connection to altssh.gitlab.com closed by remote host.
Transferred: sent 3640, received 3488 bytes, in 120.3 seconds
Bytes per second: sent 30.3, received 29.0
debug1: Exit status -1