|
Lines 198-204
Link Here
|
| 198 |
to indicate the action taken. |
198 |
to indicate the action taken. |
| 199 |
The possible actions follow: |
199 |
The possible actions follow: |
| 200 |
.Pp |
200 |
.Pp |
| 201 |
.Bl -tag -width "A" -compact -offset indent |
201 |
.Bl -tag -width "M" -compact -offset indent |
| 202 |
.It A |
202 |
.It A |
| 203 |
Added |
203 |
Added |
| 204 |
.It C |
204 |
.It C |
|
Lines 321-327
Link Here
|
| 321 |
on each conflicted file. |
321 |
on each conflicted file. |
| 322 |
For each file, the following actions are available: |
322 |
For each file, the following actions are available: |
| 323 |
.Pp |
323 |
.Pp |
| 324 |
.Bl -tag -width "(tf) theirs-full" -compact |
324 |
.Bl -tag -width "(mf) mine-full" -compact |
| 325 |
.It (p) postpone |
325 |
.It (p) postpone |
| 326 |
Ignore this conflict for now. |
326 |
Ignore this conflict for now. |
| 327 |
.It (df) diff-full |
327 |
.It (df) diff-full |