Use merge-recursive in git-checkout -m (branch switching)

diff --git a/upload-pack.c b/upload-pack.c
index 03a4156e19655c1f1d724163d0a712f63fc72c6e..3a466c6a3e66fdde2bb20b580db841c0600190bb 100644 (file)
--- a/upload-pack.c
+++ b/upload-pack.c
@@ -55,6 +55,7 @@ static ssize_t send_client_data(int fd, const char *data, ssize_t sz)
                /* emergency quit */
                fd = 2;
        if (fd == 2) {
+               /* XXX: are we happy to lose stuff here? */
                xwrite(fd, data, sz);
                return sz;
        }