From: Robin Rosenberg <robin.rosenberg@dewire.com>
Date: Sun, 27 Jan 2013 11:35:56 GMT
Subject: Behavior of stash apply vs merge
Message-ID: <61173190.1700449.1359286556865.JavaMail.root@dewire.com>
In-Reply-To: <1192924141.1697155.1359285809347.JavaMail.root@dewire.com>

Hi,

What good reason is it that 'git stash apply' gives hairy conflict markers, while 'git merge stash' does not. No renames involved.

-- robin