]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2cf8c90 fa3142c)
Merge branch 'ak/lazy-prereq-mktemp'
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:27:49 +0000 (15:27 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Dec 2016 23:27:49 +0000 (15:27 -0800)
Test code clean-up.

* ak/lazy-prereq-mktemp:
  t7610: clean up foo.XXXXXX tmpdir

1  2 
t/t7610-mergetool.sh patch | diff1 | diff2 | blob | history

diff --cc t/t7610-mergetool.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.