On Thu, Aug 20, 2015 at 2:35 AM, Laurent Bercot <[email protected]> wrote: > > I can't grep the word "addition" in my current git, either s6 or s6-rc. > Are you sure it's not a message you wrote? Can you please give me the > exact line you're running and the exact output you're getting? > Thanks, > Ugh, it was something I'd hacked in to s6-svc early on in the life of s6-rc to track down some issue I was having with something. I never committed it and sort of assumed that the next git pull I made would have complained and forced me to back it out. Apparently git merge got smarter about unstaged non-conflicts recently.
Mystery solved! I'll reply to the other stuff in the other mail fork. -- "If the doors of perception were cleansed every thing would appear to man as it is, infinite. For man has closed himself up, till he sees all things thru' narrow chinks of his cavern." -- William Blake
