mirror of
https://github.com/tmate-io/tmate.git
synced 2025-06-27 04:51:20 +02: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
Instant Terminal Sharing
Languages
C
90.6%
Roff
7.1%
M4
1%
Awk
0.6%
Makefile
0.4%
Other
0.2%