Cross Reference: /src/external/gpl2/xcvs/dist/diff/diff3.c

History log of /src/external/gpl2/xcvs/dist/diff/diff3.c
Revision	Date	Author	Comments
1.3	08-Mar-2012	christos	fix format string
1.2	06-Jan-2012	joerg	branches: 1.2.2; Don't use dangling elses.
1.1	07-Apr-2009	christos	branches: 1.1.1; Initial revision
1.1.1.1	07-Apr-2009	christos	branches: 1.1.1.1.2; 1.1.1.1.8; from ftp.gnu.org
1.1.1.1.8.1	17-Apr-2012	yamt	sync with head
1.1.1.1.2.2	13-May-2009	jym	Sync with HEAD. Second commit. See http://mail-index.netbsd.org/source-changes/2009/05/13/msg221222.html
1.1.1.1.2.1	07-Apr-2009	jym	file diff3.c was added on branch jym-xensuspend on 2009-05-13 18:52:53 +0000
1.2.2.1	03-Jun-2013	riz	Apply patch (requested by christos in ticket #889): Teach rcs about the new cvs "commitid" keyword, so that we don't bitch each time we play with an RCS file maintained by CVS. Update cvs for: - setuid fixes - acl support - path name resolution fixes - "compat format string" fixes so it can use the config files of older cvs versions.

OpenGrok