Subject: Re: how to deal with conflicts after "git stash apply"?

From: Scott Parish <[email-masked]>
Date: Sun, 21 Oct 2007 21:39:33 -0700

> You should have a look into Documentation/diff-format.txt (section 
> "combined diff format") to learn more.

Ah, thanks for the pointer; i hadn't realized that this wasn't
standard diff format. With this and what Shawn said, it all makes
sense now.

sRp

-- 
Scott Parish
http://srparish.net/