summaryrefslogtreecommitdiff
path: root/t/t5515/refs.br-remote-explicit-merge_remote-explicit
diff options
context:
space:
mode:
authorLibravatar Benoit Pierre <benoit.pierre@gmail.com>2014-03-18 11:00:55 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2014-03-18 11:26:06 -0700
commit1fc4f97d570c97471202ff561c7e3697e2faee6a (patch)
treebfec35c2d5e3e9d3a8bcd9a86bba572c9c3c9814 /t/t5515/refs.br-remote-explicit-merge_remote-explicit
parentmerge: fix GIT_EDITOR override for commit hook (diff)
downloadtgif-1fc4f97d570c97471202ff561c7e3697e2faee6a.tar.xz
merge hook tests: fix and update tests
- update 'no editor' hook test and add 'editor' hook test - make sure the tree is reset to a clean state after running a test (using test_when_finished) so later tests are not impacted Signed-off-by: Benoit Pierre <benoit.pierre@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515/refs.br-remote-explicit-merge_remote-explicit')
0 files changed, 0 insertions, 0 deletions