1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
.TH HG RESOLVE "" "" ""
.SH NAME
hg resolve \- redo merges or set/view the merge status of files
.\" Man page generated from reStructuredText.
.
.SH SYNOPSIS
.sp
.nf
.ft C
hg resolve [OPTION]... [FILE]...
.ft P
.fi
.SH DESCRIPTION
.sp
Merges with unresolved conflicts are often the result of
non\-interactive merging using the \fBinternal:merge\fP configuration
setting, or a command\-line merge tool like \fBdiff3\fP. The resolve
command is used to manage the files involved in a merge, after
\%\fBhg merge\fP\: has been run, and before \%\fBhg commit\fP\: is run (i.e. the
working directory must have two parents). See \%\fBhg help
merge\-tools\fP\: for information on configuring merge tools.
.sp
The resolve command can be used in the following ways:
.INDENT 0.0
.IP \(bu 2
.
\%\fBhg resolve [\-\-re\-merge] [\-\-tool TOOL] FILE...\fP\:: attempt to re\-merge
the specified files, discarding any previous merge attempts. Re\-merging
is not performed for files already marked as resolved. Use \fB\-\-all/\-a\fP
to select all unresolved files. \fB\-\-tool\fP can be used to specify
the merge tool used for the given files. It overrides the HGMERGE
environment variable and your configuration files. Previous file
contents are saved with a \fB.orig\fP suffix.
.IP \(bu 2
.
\%\fBhg resolve \-m [FILE]\fP\:: mark a file as having been resolved
(e.g. after having manually fixed\-up the files). The default is
to mark all unresolved files.
.IP \(bu 2
.
\%\fBhg resolve \-u [FILE]...\fP\:: mark a file as unresolved. The
default is to mark all resolved files.
.IP \(bu 2
.
\%\fBhg resolve \-l\fP\:: list files which had or still have conflicts.
In the printed list, \fBU\fP = unresolved and \fBR\fP = resolved.
You can use \fBset:unresolved()\fP or \fBset:resolved()\fP to filter
the list. See \%\fBhg help filesets\fP\: for details.
.UNINDENT
.IP Note
.
Mercurial will not let you commit files with unresolved merge
conflicts. You must use \%\fBhg resolve \-m ...\fP\: before you can
commit after a conflicting merge.
.RE
.sp
Template:
.sp
The following keywords are supported in addition to the common template
keywords and functions. See also \%\fBhg help templates\fP\:.
.INDENT 0.0
.TP
.B mergestatus
.
String. Character denoting merge conflicts, \fBU\fP or \fBR\fP.
.TP
.B path
.
String. Repository\-absolute path of the file.
.UNINDENT
.sp
Returns 0 on success, 1 if any files fail a resolve attempt.
.SH OPTIONS
.INDENT 0.0
.TP
.B \-a, \-\-all
.
select all unresolved files
.TP
.B \-l, \-\-list
.
list state of files needing merge
.TP
.B \-m, \-\-mark
.
mark files as resolved
.TP
.B \-u, \-\-unmark
.
mark files as unresolved
.TP
.B \-n, \-\-no\-status
.
hide status prefix
.TP
.B \-\-re\-merge
.
re\-merge files
.TP
.BI \-t, \-\-tool \ <TOOL>
.
specify merge tool
.TP
.BI \-I, \-\-include \ <PATTERN[+]>
.
include names matching the given patterns
.TP
.BI \-X, \-\-exclude \ <PATTERN[+]>
.
exclude names matching the given patterns
.TP
.BI \-T, \-\-template \ <TEMPLATE>
.
display with template
.UNINDENT
.sp
[+] marked option can be specified multiple times
.\" Generated by docutils manpage writer.
.\"
.
|
