OpenBSD CVS

CVS log for src/usr.bin/rcs/rcsmerge.1


[BACK] Up to [local] / src / usr.bin / rcs

Request diff between arbitrary revisions


Default branch: MAIN


Revision 1.15 / (download) - annotate - [select for diffs], Fri Sep 3 11:09:29 2010 UTC (13 years, 8 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, HEAD
Changes since 1.14: +15 -15 lines
Diff to previous 1.14 (colored)

add an EXIT STATUS section for /usr/bin;

Revision 1.14 / (download) - annotate - [select for diffs], Thu May 31 19:20:15 2007 UTC (16 years, 11 months ago) by jmc
Branch: MAIN
CVS Tags: 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
Changes since 1.13: +2 -2 lines
Diff to previous 1.13 (colored)

convert to new .Dd format;

Revision 1.13 / (download) - annotate - [select for diffs], Mon May 15 07:43:03 2006 UTC (18 years ago) by xsa
Branch: MAIN
CVS Tags: OPENBSD_4_1_BASE, OPENBSD_4_1, OPENBSD_4_0_BASE, OPENBSD_4_0
Changes since 1.12: +2 -1 lines
Diff to previous 1.12 (colored)

.Xr merge(1)

Revision 1.12 / (download) - annotate - [select for diffs], Tue May 9 14:03:55 2006 UTC (18 years ago) by jmc
Branch: MAIN
Changes since 1.11: +3 -7 lines
Diff to previous 1.11 (colored)

move -e to compat land; pointed out by ray
ok xsa

Revision 1.11 / (download) - annotate - [select for diffs], Mon May 8 10:02:02 2006 UTC (18 years ago) by xsa
Branch: MAIN
Changes since 1.10: +14 -1 lines
Diff to previous 1.10 (colored)

add DIAGNOSTICS section.

Revision 1.10 / (download) - annotate - [select for diffs], Thu Apr 27 09:58:12 2006 UTC (18 years ago) by jmc
Branch: MAIN
Changes since 1.9: +1 -9 lines
Diff to previous 1.9 (colored)

remove the revision sections - it's explained in rcs(1) and i think
that's enough...

Revision 1.9 / (download) - annotate - [select for diffs], Mon Apr 24 22:06:49 2006 UTC (18 years ago) by jmc
Branch: MAIN
Changes since 1.8: +9 -1 lines
Diff to previous 1.8 (colored)

be consistent when describing revision selection;
input/ok: xsa joris niallo ray

Revision 1.8 / (download) - annotate - [select for diffs], Mon Apr 24 13:32:10 2006 UTC (18 years ago) by jmc
Branch: MAIN
Changes since 1.7: +7 -11 lines
Diff to previous 1.7 (colored)

- move -A into compat land
- tweak -E description accordingly

ok xsa

Revision 1.7 / (download) - annotate - [select for diffs], Mon Apr 24 08:18:06 2006 UTC (18 years ago) by jmc
Branch: MAIN
Changes since 1.6: +7 -2 lines
Diff to previous 1.6 (colored)

-r is not optional: simplify its synopsis, but improve its description;
ok xsa

Revision 1.6 / (download) - annotate - [select for diffs], Wed Apr 19 11:16:14 2006 UTC (18 years, 1 month ago) by jmc
Branch: MAIN
Changes since 1.5: +9 -4 lines
Diff to previous 1.5 (colored)

- signpost to keyword substitution section
- simplify synopsis

Revision 1.5 / (download) - annotate - [select for diffs], Mon Mar 6 14:44:51 2006 UTC (18 years, 2 months ago) by jmc
Branch: MAIN
Changes since 1.4: +7 -5 lines
Diff to previous 1.4 (colored)

move compat flags into a STANDARDS section;
update usage() whilst here...

Revision 1.4 / (download) - annotate - [select for diffs], Mon Mar 6 09:41:53 2006 UTC (18 years, 2 months ago) by deraadt
Branch: MAIN
Changes since 1.3: +1 -1 lines
Diff to previous 1.3 (colored)

many spacing cleanups

Revision 1.3 / (download) - annotate - [select for diffs], Tue Nov 22 14:17:45 2005 UTC (18 years, 6 months ago) by xsa
Branch: MAIN
CVS Tags: OPENBSD_3_9_BASE, OPENBSD_3_9
Changes since 1.2: +13 -1 lines
Diff to previous 1.2 (colored)

add EXAMPLES section; jmc ok

Revision 1.2 / (download) - annotate - [select for diffs], Wed Nov 2 11:26:19 2005 UTC (18 years, 6 months ago) by xsa
Branch: MAIN
Changes since 1.1: +6 -4 lines
Diff to previous 1.1 (colored)

sync with Reality;

Revision 1.1 / (download) - annotate - [select for diffs], Tue Oct 18 16:16:39 2005 UTC (18 years, 7 months ago) by xsa
Branch: MAIN

skeletons for rcsmerge(1);

This form allows you to request diff's between any two revisions of a file. You may select a symbolic revision name using the selection box or you may type in a numeric name using the type-in text box.