Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk

diff --git a/t/t3403-rebase-skip.sh b/t/t3403-rebase-skip.sh
index 977c498f00f2d8e2066bd586130ee84fe1a196a3..9e11ed295d02f760f01a5b4fcb371b17a5b710cf 100755 (executable)
--- a/t/t3403-rebase-skip.sh
+++ b/t/t3403-rebase-skip.sh
@@ -54,4 +54,3 @@ test_expect_success 'merge and reference trees equal' \
 test_debug 'gitk --all & sleep 1'
 
 test_done
-