1. Stefan Saasen
  2. git

Commits

Heiko Voigt  committed 420432d

add missing && to submodule-merge testcase

Signed-off-by: Heiko Voigt <hvoigt@hvoigt.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

  • Participants
  • Parent commits d66ee04
  • Branches master

Comments (0)

Files changed (1)

File t/t7405-submodule-merge.sh

View file
 	 git commit -m sub-b) &&
 	git add sub &&
 	test_tick &&
-	git commit -m b
+	git commit -m b &&
 
 	git checkout -b c a &&
 	git merge -s ours b &&