Re: [PATCH] mergetools/p4merge: Handle /dev/null

2012-12-19 Thread David Aguilar
On Sat, Oct 27, 2012 at 1:47 AM, Jeremy Morton ad...@game-point.net wrote: Sorry to be replying to this so late; I hadn't noticed the post until now! I've tried putting that code in my p4merge script and yes it does indeed work fine. However, it puts a temporary file in the working directory

Re: [PATCH] mergetools/p4merge: Handle /dev/null

2012-10-27 Thread Jeremy Morton
Sorry to be replying to this so late; I hadn't noticed the post until now! I've tried putting that code in my p4merge script and yes it does indeed work fine. However, it puts a temporary file in the working directory which I'm not sure is a good idea? If we look at this patch which