![[BACK]](/icons/back.gif){kind=icon}
Up to [local] / src / usr.bin / diff3
Request diff between arbitrary revisions
Default branch: MAIN
Revision 1.7 / (download) - annotate - [select for diffs], Thu May 31 19:20:09 2007 UTC (16 years, 11 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_7_5_BASE,
OPENBSD_7_5,
OPENBSD_7_4_BASE,
OPENBSD_7_4,
OPENBSD_7_3_BASE,
OPENBSD_7_3,
OPENBSD_7_2_BASE,
OPENBSD_7_2,
OPENBSD_7_1_BASE,
OPENBSD_7_1,
OPENBSD_7_0_BASE,
OPENBSD_7_0,
OPENBSD_6_9_BASE,
OPENBSD_6_9,
OPENBSD_6_8_BASE,
OPENBSD_6_8,
OPENBSD_6_7_BASE,
OPENBSD_6_7,
OPENBSD_6_6_BASE,
OPENBSD_6_6,
OPENBSD_6_5_BASE,
OPENBSD_6_5,
OPENBSD_6_4_BASE,
OPENBSD_6_4,
OPENBSD_6_3_BASE,
OPENBSD_6_3,
OPENBSD_6_2_BASE,
OPENBSD_6_2,
OPENBSD_6_1_BASE,
OPENBSD_6_1,
OPENBSD_6_0_BASE,
OPENBSD_6_0,
OPENBSD_5_9_BASE,
OPENBSD_5_9,
OPENBSD_5_8_BASE,
OPENBSD_5_8,
OPENBSD_5_7_BASE,
OPENBSD_5_7,
OPENBSD_5_6_BASE,
OPENBSD_5_6,
OPENBSD_5_5_BASE,
OPENBSD_5_5,
OPENBSD_5_4_BASE,
OPENBSD_5_4,
OPENBSD_5_3_BASE,
OPENBSD_5_3,
OPENBSD_5_2_BASE,
OPENBSD_5_2,
OPENBSD_5_1_BASE,
OPENBSD_5_1,
OPENBSD_5_0_BASE,
OPENBSD_5_0,
OPENBSD_4_9_BASE,
OPENBSD_4_9,
OPENBSD_4_8_BASE,
OPENBSD_4_8,
OPENBSD_4_7_BASE,
OPENBSD_4_7,
OPENBSD_4_6_BASE,
OPENBSD_4_6,
OPENBSD_4_5_BASE,
OPENBSD_4_5,
OPENBSD_4_4_BASE,
OPENBSD_4_4,
OPENBSD_4_3_BASE,
OPENBSD_4_3,
OPENBSD_4_2_BASE,
OPENBSD_4_2,
HEAD
Changes since 1.6: +2 -2 lines
Diff to previous 1.6 (colored)
convert to new .Dd format;
Revision 1.6 / (download) - annotate - [select for diffs], Wed Feb 22 22:35:11 2006 UTC (18 years, 2 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE,
OPENBSD_4_1,
OPENBSD_4_0_BASE,
OPENBSD_4_0,
OPENBSD_3_9_BASE,
OPENBSD_3_9
Changes since 1.5: +17 -17 lines
Diff to previous 1.5 (colored)
sort options + sync usage();
Revision 1.5 / (download) - annotate - [select for diffs], Tue Dec 27 12:48:56 2005 UTC (18 years, 4 months ago) by jmc
Branch: MAIN
Changes since 1.4: +3 -2 lines
Diff to previous 1.4 (colored)
+.Xr sdiff 1 ,
Revision 1.4 / (download) - annotate - [select for diffs], Wed Jul 7 14:28:23 2004 UTC (19 years, 10 months ago) by jaredy
Branch: MAIN
CVS Tags: OPENBSD_3_8_BASE,
OPENBSD_3_8,
OPENBSD_3_7_BASE,
OPENBSD_3_7,
OPENBSD_3_6_BASE,
OPENBSD_3_6
Changes since 1.3: +3 -3 lines
Diff to previous 1.3 (colored)
- add shell prompt to command example - fix location of real diff3prog ok jmc@ otto@
Revision 1.3 / (download) - annotate - [select for diffs], Fri Oct 24 08:01:52 2003 UTC (20 years, 7 months ago) by jmc
Branch: MAIN
CVS Tags: OPENBSD_3_5_BASE,
OPENBSD_3_5
Changes since 1.2: +11 -12 lines
Diff to previous 1.2 (colored)
- fix rcs Xr; from Jared Yanovich - correct order for sections - remove unnecessary .Pp and -compact from display - kill some double spacing - sort SEE ALSO
Revision 1.2 / (download) - annotate - [select for diffs], Mon Jul 14 17:43:52 2003 UTC (20 years, 10 months ago) by deraadt
Branch: MAIN
CVS Tags: OPENBSD_3_4_BASE,
OPENBSD_3_4
Changes since 1.1: +2 -2 lines
Diff to previous 1.1 (colored)
knf
Revision 1.1 / (download) - annotate - [select for diffs], Thu Jul 10 16:06:07 2003 UTC (20 years, 10 months ago) by millert
Branch: MAIN
A matching diff3 from 32V w/ some UCB changes. I cleaned this up a bit (KNF and -Wall) and rewrote the shell front-end.