diff options
| author | David Aguilar <davvid@gmail.com> | 2012-10-11 07:22:36 +0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-10-11 22:50:00 +0400 |
| commit | 3facc60031a5b860cae8cb26957e5b4e80820c34 (patch) | |
| tree | 3e7c56d63138b7c19c55a548552f0822f19d4ac8 /mergetools/defaults | |
| parent | 40701adbcbbc1e3e4485562a36343f4781e62be5 (diff) | |
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...
Diffstat (limited to 'mergetools/defaults')
0 files changed, 0 insertions, 0 deletions