Re: Fixing the p4merge launch shell script

2012-10-04 Thread David Aguilar
On Wed, Oct 3, 2012 at 1:34 AM, Jeremy Morton ad...@game-point.net wrote: Junio C Hamano gitster at pobox.com writes: Jeremy Morton admin at game-point.net writes: I've noticed that the p4merge shell script could do with some improvement when it comes to merging. Because p4merge throws

Re: Fixing the p4merge launch shell script

2012-10-03 Thread Jeremy Morton
Junio C Hamano gitster at pobox.com writes: Jeremy Morton admin at game-point.net writes: I've noticed that the p4merge shell script could do with some improvement when it comes to merging. Because p4merge throws up an error when one of the files it's given to diff is /dev/null, git

Fixing the p4merge launch shell script

2012-10-02 Thread Jeremy Morton
Hi, I've noticed that the p4merge shell script could do with some improvement when it comes to merging. Because p4merge throws up an error when one of the files it's given to diff is /dev/null, git needs to create a temporary empty file and pass that to p4merge when diffing a file that has

Re: Fixing the p4merge launch shell script

2012-10-02 Thread Junio C Hamano
Jeremy Morton ad...@game-point.net writes: I've noticed that the p4merge shell script could do with some improvement when it comes to merging. Because p4merge throws up an error when one of the files it's given to diff is /dev/null, git needs to create a temporary empty file and pass that to