2 commits

Author	SHA1	Message	Date
Kristian Høgsberg	9e54dc6c12	Remove unecessary hard-coding of EDITOR=':' VISUAL=':' in some test suites. ... They are already set and exoprted by sourcing ./test-lib.sh in all test scripts. Signed-off-by: Kristian Høgsberg <krh@redhat.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>	2007-11-02 15:40:20 -07:00
Junio C Hamano	acb4441e0d	Use merge-recursive in git-revert/git-cherry-pick ... This makes revert and cherry-pick to use merge-recursive, to allow them to notice renames. A pair of test scripts demonstrate that an old change before a rename happened can be applied (reverted) after a rename with cherry-pick (with revert). Signed-off-by: Junio C Hamano <junkio@cox.net>	2007-01-14 22:00:34 -08:00