src-test/contrib/libreadline/complete.c, branch releng/7.0FreeBSD source treehttps://cgit-dev.freebsd.org/src-test/atom?h=releng%2F7.02006-12-31T09:22:31ZMerge conflicts2006-12-31T09:22:31ZAndrey A. Chernovache@FreeBSD.org2006-12-31T09:22:31Zurn:sha1:ff240e75e9003e8ded6ef58f4658e0039d41b830Resolve conflicts2006-03-27T23:11:32ZAndrey A. Chernovache@FreeBSD.org2006-03-27T23:11:32Zurn:sha1:ea3d03fb07fdb2023234ba0e7cbfeab907ef73d1Force these files back off the vendor branch. They should NEVER have been2004-10-21T20:02:02ZPeter Wemmpeter@FreeBSD.org2004-10-21T20:02:02Zurn:sha1:3dc55b14839c0a92c7ac8986878b89eb522fb611
put back on there in the first place. :-(
Note that complete.c will need a readline 5.0 merge.
Merge local changes2003-08-31T18:29:38ZAndrey A. Chernovache@FreeBSD.org2003-08-31T18:29:38Zurn:sha1:89407787066fa2601eebe8fda84ca1dd7524c2a5Merge local changes2001-04-11T03:15:56ZAndrey A. Chernovache@FreeBSD.org2001-04-11T03:15:56Zurn:sha1:a39df769f39320bc4a84b95ce70962ee07558260Merge conflicts2000-03-19T22:00:57ZAndrey A. Chernovache@FreeBSD.org2000-03-19T22:00:57Zurn:sha1:e14751ab66c9fb4ef205b302902486b9104dc42fmerge1999-05-28T02:17:15ZAndrey A. Chernovache@FreeBSD.org1999-05-28T02:17:15Zurn:sha1:3d8a49c3011c7b0d7eb28452b96ce33cb209f1faMerge local changes1998-04-28T06:49:42ZAndrey A. Chernovache@FreeBSD.org1998-04-28T06:49:42Zurn:sha1:49772d612981e84e8a803d2667b6162bb8b9313bMerge changes1997-11-06T01:00:03ZAndrey A. Chernovache@FreeBSD.org1997-11-06T01:00:03Zurn:sha1:4cd7551c19556ba34cab2af231babd53039221a4Merge with previous variant1997-06-07T12:58:06ZAndrey A. Chernovache@FreeBSD.org1997-06-07T12:58:06Zurn:sha1:88d4735de646f7c2bd0b67b33ffac5739251a7ec