diff options
| author | June McEnroe <june@causal.agency> | 2017-08-31 15:37:36 -0400 |
|---|---|---|
| committer | June McEnroe <june@causal.agency> | 2017-08-31 15:37:36 -0400 |
| commit | 2aa5fe545bdba997bdb728a2dfb2e3bca93766ae (patch) | |
| tree | a7c529bf45c3a713538fcc4d7dbdeb88e8e7f322 /sshd_config | |
| parent | Choose B for tiles with equal modify times (diff) | |
| download | torus-2aa5fe545bdba997bdb728a2dfb2e3bca93766ae.tar.gz torus-2aa5fe545bdba997bdb728a2dfb2e3bca93766ae.zip | |
Clean up merge tool
Choose the version with the most recent access if the modify times are the same.
Diffstat (limited to 'sshd_config')
0 files changed, 0 insertions, 0 deletions