mergetools: add support for guiffy

diff --git a/t/t4150-am.sh b/t/t4150-am.sh
index 512c754e02a84ee0beb467d3862b0d677c7aae2c..1eccfb71d0c8e26f88708459f065dea622baf9d3 100755 (executable)
--- a/t/t4150-am.sh
+++ b/t/t4150-am.sh
@@ -662,6 +662,11 @@ test_expect_success 'am pauses on conflict' '
        test -d .git/rebase-apply
 '
 
+test_expect_success 'am --show-current-patch' '
+       git am --show-current-patch >actual.patch &&
+       test_cmp .git/rebase-apply/0001 actual.patch
+'
+
 test_expect_success 'am --skip works' '
        echo goodbye >expected &&
        git am --skip &&