Cvs Commit: cvsnt

[email protected] Fri, 2 Feb 2018 11:50:12 +0000 (GMT)
Newsgroups gmane.comp.version-control.cvs.windows-nt.cvs
Message-ID <554b5a74506225f5@obrien>
CVSROOT:	/cvs
Module name:	cvsnt
Changes by:	[email protected]		Fri Feb  2 11:50:06 2018
On host:	mail.march-hare.com

Directory: cvsnt/testcvs

M testcvs.py	CVSNT_BRANCH_2_5_03_2382	1.20.2.12.6.25 -> 1.20.2.12.6.26	Bug Id: 7246

Directory: cvsnt/testcvs/test_data

A merge_test.txt.8	CVSNT_BRANCH_2_5_03_2382	 -> 1.1.2.1	Bug Id: 7246
A merge_test.txt.9	CVSNT_BRANCH_2_5_03_2382	 -> 1.1.2.1	Bug Id: 7246

Log message:
BUg 7246: This adds new test cases for 'diff -c' and 'diff -N -c'.