diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2009-02-23 06:08:11 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-02-23 21:56:45 -0800 |
| commit | 161261b12b3777bc78ef3fbe84ccf595dd195704 (patch) | |
| tree | 435527002350b690bba1ce9f47dea038dfca963c /builtin-merge-ours.c | |
| parent | 535bb89320ba949f0d64eda530ba5dec0ec6f188 (diff) | |
| download | git-161261b12b3777bc78ef3fbe84ccf595dd195704.tar.gz | |
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 'builtin-merge-ours.c')
0 files changed, 0 insertions, 0 deletions