mirror of
https://github.com/tmate-io/tmate-ssh-server.git
synced 2020-11-18 19:53:51 -08:00
The ours strategy assumes one subsumes the other -- which isn't the case for the portable version, so for now -- just go back to using the default merge strategy of recursive, and fix-up any conflicts manually.
Description
No description provided
Languages
C
90.8%
Roff
6.9%
M4
0.9%
Awk
0.6%
Makefile
0.4%
Other
0.3%