summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Michael Haggerty <mhagger@alum.mit.edu>2009-02-23 06:08:11 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-02-23 21:56:45 -0800
commit161261b12b3777bc78ef3fbe84ccf595dd195704 (patch)
tree435527002350b690bba1ce9f47dea038dfca963c /git-mergetool.sh
parentStart a library for cvsimport-related tests (diff)
downloadtgif-161261b12b3777bc78ef3fbe84ccf595dd195704.tar.xz
Use CVS's -f option if available (ignore user's ~/.cvsrc file)
A user's ~/.cvsrc file can change the basic behavior of CVS commands. Therefore we should ignore it in order to ensure consistent results from the test suite. Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions