Re: [PATCH] t7610-mergetool: add test cases for tempfile behavior

2016-03-09 Thread Junio C Hamano
David Aguilar writes: > Ensure that mergetool.keepTemporaries is honored when resolving > delete/delete conflicts. > > Ensure that stderr stays empty, and that worktree directories > created by mergetool to are removed. > > Signed-off-by: David Aguilar > ---

[PATCH] t7610-mergetool: add test cases for tempfile behavior

2016-03-08 Thread David Aguilar
Ensure that mergetool.keepTemporaries is honored when resolving delete/delete conflicts. Ensure that stderr stays empty, and that worktree directories created by mergetool to are removed. Signed-off-by: David Aguilar --- t/t7610-mergetool.sh | 34