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
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
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 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
4 matches
Mail list logo