# HG changeset patch
# User Steve Huston <huston@astro.princeton.edu>
# Date 1583269167 18000
# Node ID daa1d18ece79c14ac77ad362986d46f5288c8b78
# Parent  580d78e54d7c31f19b6ce2dc16a04c84ac55f49e# Parent  bce3800bb73638a73215d7ebf785f0bde775237b
Merging heads

diff -r bce3800bb736 -r daa1d18ece79 .ssh/sockets/README
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.ssh/sockets/README	Tue Mar 03 15:59:27 2020 -0500
@@ -0,0 +1,2 @@
+These sockets are for SSH control masters; this file is simply to make sure hg
+creates this directory on a checkout so things work right.