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
> > needs to create a temporary empty file and pass that to p4merge when
> > diffing a file that has been created/deleted (eg. create file, git add
> > ., git diff --cached).
> > ...
> > Thoughts?  Is there an easier way to do this?
> Which version of git?  Perhaps you do not have ec245ba (mergetool:
> Provide an empty file when needed, 2012-01-19) yet?

That patch fixes the mergetool part, but the part I was referring to was the
difftool part, which still has this problem.

Best regards,
Jeremy Morton (Jez)

To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to