Login | Register
My pages Projects Community openCollabNet

Discussions > cvs > CVS update: /svnutils/trunk/src/doc/mergesvn.1

svnutils
Discussion topic

Back to topic list

CVS update: /svnutils/trunk/src/doc/mergesvn.1

Reply

Author sunny256
Full name Øyvind A. Holm
Date 2007-03-05 08:47:49 PST
Message User: sunny256
Date: 2007-03-05 08:47:49-0800
Log:
 r188 | sunny256 | 2007-03-05 16:47:21 +0000 (Mon, 05 Mar 2007) | 3 lines
 
 * /trunk/src/doc/mergesvn.1
   Generated from mergesvn r187.

File Changes:

Directory: /svnutils/trunk/src/doc/
====================​===============

File [changed]: mergesvn.1
Url: http://svnutils.tigr​is.org/source/browse​/svnutils/trunk/src/​doc/mergesvn.1?r1=1.​4&r2=1.5
Delta lines: +9 -2
-------------------
--- mergesvn.1 2007-03-05 08:44:33-0800 1.4
+++ mergesvn.1 2007-03-05 08:47:47-0800 1.5
@@ -129,12 +129,12 @@
 .\" ====================​====================​====================​============
 .\"
 .IX Title "MERGESVN 1"
-.TH MERGESVN 1 "2007-03-04" "perl v5.8.4" "User Contributed Perl Documentation"
+.TH MERGESVN 1 "2007-03-05" "perl v5.8.4" "User Contributed Perl Documentation"
 .SH "NAME"
 mergesvn
 .SH "REVISION"
 .IX Header "REVISION"
-$Id: mergesvn 183 2007\-03\-04 15:38:04Z sunny $
+$Id: mergesvn 187 2007\-03\-05 16:38:47Z sunny256 $
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 mergesvn [options] [file [files [...]]]
@@ -160,6 +160,13 @@
 .IX Item "-a, --alias x"
 Use \fIx\fR as alias for the master \s-1URL\s0. The old value will still be
 written to the mergesvn property.
+.IP "\fB\-c\fR, \fB\-\-conflict\fR" 4
+.IX Item "-c, --conflict"
+Do not merge, but search for the first revision a conflict will occur
+when a merge is done. After the search is finished, the first revision
+number of a troublesome patch is printed, and you can choose by using
+the \-t option if you want to include the conflicting revision in the
+merge.
 .IP "\fB\-d\fR, \fB\-\-diff\fR" 4
 .IX Item "-d, --diff"
 Instead of merging, show a repository diff between the master \s-1URL\s0 and

« Previous message in topic | 1 of 1 | Next message in topic »

Messages

Show all messages in topic

CVS update: /svnutils/trunk/src/doc/mergesvn.1 sunny256 Øyvind A. Holm 2007-03-05 08:47:49 PST
Messages per page: