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
Jeremy Morton 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 p4merge when
>
Junio C Hamano pobox.com> writes:
>
> Jeremy Morton 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
> > nee
On Wed, Oct 3, 2012 at 1:34 AM, Jeremy Morton wrote:
> Junio C Hamano pobox.com> writes:
>
>>
>> Jeremy Morton 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 on
4 matches
Mail list logo