| commit | 3facc60031a5b860cae8cb26957e5b4e80820c34 | |
| author | David Aguilar <davvid@gmail.com> | |
| Thu, 11 Oct 2012 03:22:36 +0000 (10 20:22 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 11 Oct 2012 18:50:00 +0000 (11 11:50 -0700) | ||
| tree | 3e7c56d63138b7c19c55a548552f0822f19d4ac8 | treesnapshot (tar.gz zip) |
| parent | 40701adbcbbc1e3e4485562a36343f4781e62be5 | commitdiff |
mergetools/p4merge: Handle "/dev/null"
p4merge does not properly handle the case where "/dev/null"
is passed as a filename.
Work it around by creating a temporary file for this purpose.
Reported-by: Jeremy Morton <admin@game-point.net>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Needs to be amended with Tested-by when a report comes...
p4merge does not properly handle the case where "/dev/null"
is passed as a filename.
Work it around by creating a temporary file for this purpose.
Reported-by: Jeremy Morton <admin@game-point.net>
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
Needs to be amended with Tested-by when a report comes...
| mergetools/p4merge | diffblobblamehistory |