From: Jon Loeliger Date: Thu, 22 Sep 2005 16:31:34 GMT Subject: Please undo "Use git-merge instead of git-resolve in git-pull" Message-ID: So, like, the other day Linus Torvalds mumbled: > Still with me? Grasshopper still trying to keep up. You and Petr have given me much to think about and try. Give me a moment of tree-building to grasp the pebble... jdl