Subject: Behavior of stash apply vs merge

From: Robin Rosenberg <[email-masked]>
Date: Sun, 27 Jan 2013 12:35:56 +0100 (CET)

Hi,

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

-- robin