| commit | a88183f168660bb784baad536e44239a1f3dffb8 | |
| author | David Aguilar <davvid@gmail.com> | |
| Sat, 23 Jan 2010 06:03:36 +0000 (22 22:03 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Sat, 23 Jan 2010 06:07:29 +0000 (22 22:07 -0800) | ||
| tree | 95f441412d5b6cea3c802603ed4998fec823b493 | treesnapshot (tar.gz zip) |
| parent | aba7dea83bfba411dee0271491d6199d2dca61d9 | commitdiff |
t7800-difftool.sh: Test mergetool.prompt fallback
4cacc621 made difftool fall back to mergetool.prompt
when difftool.prompt is unconfigured. This adds a test.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
4cacc621 made difftool fall back to mergetool.prompt
when difftool.prompt is unconfigured. This adds a test.
Signed-off-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t7800-difftool.sh | diffblobblamehistory |