From: Scott Parish Date: Mon, 22 Oct 2007 04:39:33 GMT Subject: Re: how to deal with conflicts after "git stash apply"? Message-ID: <20071022043933.GL16291@srparish.net> In-Reply-To: > 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/