| blob | b5f686154ec542b6d87e35d2b028dfb41b36be75 |
1 '\" t
2 .\" Title: git-mergetool
3 .\" Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
4 .\" Generator: DocBook XSL Stylesheets vsnapshot <http://docbook.sf.net/>
5 .\" Date: 2023-06-01
6 .\" Manual: Git Manual
7 .\" Source: Git 2.41.0
8 .\" Language: English
9 .\"
10 .TH "GIT\-MERGETOOL" "1" "2023\-06\-01" "Git 2\&.41\&.0" "Git Manual"
11 .\" -----------------------------------------------------------------
12 .\" * Define some portability stuff
13 .\" -----------------------------------------------------------------
14 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
15 .\" http://bugs.debian.org/507673
16 .\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
17 .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
18 .ie \n(.g .ds Aq \(aq
19 .el .ds Aq '
20 .\" -----------------------------------------------------------------
21 .\" * set default formatting
22 .\" -----------------------------------------------------------------
23 .\" disable hyphenation
24 .nh
25 .\" disable justification (adjust text to left margin only)
26 .ad l
27 .\" -----------------------------------------------------------------
28 .\" * MAIN CONTENT STARTS HERE *
29 .\" -----------------------------------------------------------------
30 .SH "NAME"
31 git-mergetool \- Run merge conflict resolution tools to resolve merge conflicts
32 .SH "SYNOPSIS"
33 .sp
34 .nf
35 \fIgit mergetool\fR [\-\-tool=<tool>] [\-y | \-\-[no\-]prompt] [<file>\&...]
36 .fi
37 .sp
38 .SH "DESCRIPTION"
39 .sp
40 Use \fBgit mergetool\fR to run one of several merge utilities to resolve merge conflicts\&. It is typically run after \fIgit merge\fR\&.
41 .sp
42 If one or more <file> parameters are given, the merge tool program will be run to resolve differences on each file (skipping those without conflicts)\&. Specifying a directory will include all unresolved files in that path\&. If no <file> names are specified, \fIgit mergetool\fR will run the merge tool program on every file with merge conflicts\&.
43 .SH "OPTIONS"
44 .PP
45 \-t <tool>, \-\-tool=<tool>
46 .RS 4
47 Use the merge resolution program specified by <tool>\&. Valid values include emerge, gvimdiff, kdiff3, meld, vimdiff, and tortoisemerge\&. Run
48 \fBgit mergetool \-\-tool\-help\fR
49 for the list of valid <tool> settings\&.
50 .sp
51 If a merge resolution program is not specified,
52 \fIgit mergetool\fR
53 will use the configuration variable
54 \fBmerge\&.tool\fR\&. If the configuration variable
55 \fBmerge\&.tool\fR
56 is not set,
57 \fIgit mergetool\fR
58 will pick a suitable default\&.
59 .sp
60 You can explicitly provide a full path to the tool by setting the configuration variable
61 \fBmergetool\&.<tool>\&.path\fR\&. For example, you can configure the absolute path to kdiff3 by setting
62 \fBmergetool\&.kdiff3\&.path\fR\&. Otherwise,
63 \fIgit mergetool\fR
64 assumes the tool is available in PATH\&.
65 .sp
66 Instead of running one of the known merge tool programs,
67 \fIgit mergetool\fR
68 can be customized to run an alternative program by specifying the command line to invoke in a configuration variable
69 \fBmergetool\&.<tool>\&.cmd\fR\&.
70 .sp
71 When
72 \fIgit mergetool\fR
73 is invoked with this tool (either through the
74 \fB\-t\fR
75 or
76 \fB\-\-tool\fR
77 option or the
78 \fBmerge\&.tool\fR
79 configuration variable) the configured command line will be invoked with
80 \fB$BASE\fR
81 set to the name of a temporary file containing the common base for the merge, if available;
82 \fB$LOCAL\fR
83 set to the name of a temporary file containing the contents of the file on the current branch;
84 \fB$REMOTE\fR
85 set to the name of a temporary file containing the contents of the file to be merged, and
86 \fB$MERGED\fR
87 set to the name of the file to which the merge tool should write the result of the merge resolution\&.
88 .sp
89 If the custom merge tool correctly indicates the success of a merge resolution with its exit code, then the configuration variable
90 \fBmergetool\&.<tool>\&.trustExitCode\fR
91 can be set to
92 \fBtrue\fR\&. Otherwise,
93 \fIgit mergetool\fR
94 will prompt the user to indicate the success of the resolution after the custom tool has exited\&.
95 .RE
96 .PP
97 \-\-tool\-help
98 .RS 4
99 Print a list of merge tools that may be used with
100 \fB\-\-tool\fR\&.
101 .RE
102 .PP
103 \-y, \-\-no\-prompt
104 .RS 4
105 Don\(cqt prompt before each invocation of the merge resolution program\&. This is the default if the merge resolution program is explicitly specified with the
106 \fB\-\-tool\fR
107 option or with the
108 \fBmerge\&.tool\fR
109 configuration variable\&.
110 .RE
111 .PP
112 \-\-prompt
113 .RS 4
114 Prompt before each invocation of the merge resolution program to give the user a chance to skip the path\&.
115 .RE
116 .PP
117 \-g, \-\-gui
118 .RS 4
119 When
120 \fIgit\-mergetool\fR
121 is invoked with the
122 \fB\-g\fR
123 or
124 \fB\-\-gui\fR
125 option the default merge tool will be read from the configured
126 \fBmerge\&.guitool\fR
127 variable instead of
128 \fBmerge\&.tool\fR\&. If
129 \fBmerge\&.guitool\fR
130 is not set, we will fallback to the tool configured under
131 \fBmerge\&.tool\fR\&. This may be autoselected using the configuration variable
132 \fBmergetool\&.guiDefault\fR\&.
133 .RE
134 .PP
135 \-\-no\-gui
136 .RS 4
137 This overrides a previous
138 \fB\-g\fR
139 or
140 \fB\-\-gui\fR
141 setting or
142 \fBmergetool\&.guiDefault\fR
143 configuration and reads the default merge tool from the configured
144 \fBmerge\&.tool\fR
145 variable\&.
146 .RE
147 .PP
148 \-O<orderfile>
149 .RS 4
150 Process files in the order specified in the <orderfile>, which has one shell glob pattern per line\&. This overrides the
151 \fBdiff\&.orderFile\fR
152 configuration variable (see
153 \fBgit-config\fR(1))\&. To cancel
154 \fBdiff\&.orderFile\fR, use
155 \fB\-O/dev/null\fR\&.
156 .RE
157 .SH "CONFIGURATION"
158 .sp
159 Everything below this line in this section is selectively included from the \fBgit-config\fR(1) documentation\&. The content is the same as what\(cqs found there:
160 .PP
161 mergetool\&.<tool>\&.path
162 .RS 4
163 Override the path for the given tool\&. This is useful in case your tool is not in the PATH\&.
164 .RE
165 .PP
166 mergetool\&.<tool>\&.cmd
167 .RS 4
168 Specify the command to invoke the specified merge tool\&. The specified command is evaluated in shell with the following variables available:
169 \fIBASE\fR
170 is the name of a temporary file containing the common base of the files to be merged, if available;
171 \fILOCAL\fR
172 is the name of a temporary file containing the contents of the file on the current branch;
173 \fIREMOTE\fR
174 is the name of a temporary file containing the contents of the file from the branch being merged;
175 \fIMERGED\fR
176 contains the name of the file to which the merge tool should write the results of a successful merge\&.
177 .RE
178 .PP
179 mergetool\&.<tool>\&.hideResolved
180 .RS 4
181 Allows the user to override the global
182 \fBmergetool\&.hideResolved\fR
183 value for a specific tool\&. See
184 \fBmergetool\&.hideResolved\fR
185 for the full description\&.
186 .RE
187 .PP
188 mergetool\&.<tool>\&.trustExitCode
189 .RS 4
190 For a custom merge command, specify whether the exit code of the merge command can be used to determine whether the merge was successful\&. If this is not set to true then the merge target file timestamp is checked and the merge assumed to have been successful if the file has been updated, otherwise the user is prompted to indicate the success of the merge\&.
191 .RE
192 .PP
193 mergetool\&.meld\&.hasOutput
194 .RS 4
195 Older versions of
196 \fBmeld\fR
197 do not support the
198 \fB\-\-output\fR
199 option\&. Git will attempt to detect whether
200 \fBmeld\fR
201 supports
202 \fB\-\-output\fR
203 by inspecting the output of
204 \fBmeld \-\-help\fR\&. Configuring
205 \fBmergetool\&.meld\&.hasOutput\fR
206 will make Git skip these checks and use the configured value instead\&. Setting
207 \fBmergetool\&.meld\&.hasOutput\fR
208 to
209 \fBtrue\fR
210 tells Git to unconditionally use the
211 \fB\-\-output\fR
212 option, and
213 \fBfalse\fR
214 avoids using
215 \fB\-\-output\fR\&.
216 .RE
217 .PP
218 mergetool\&.meld\&.useAutoMerge
219 .RS 4
220 When the
221 \fB\-\-auto\-merge\fR
222 is given, meld will merge all non\-conflicting parts automatically, highlight the conflicting parts and wait for user decision\&. Setting
223 \fBmergetool\&.meld\&.useAutoMerge\fR
224 to
225 \fBtrue\fR
226 tells Git to unconditionally use the
227 \fB\-\-auto\-merge\fR
228 option with
229 \fBmeld\fR\&. Setting this value to
230 \fBauto\fR
231 makes git detect whether
232 \fB\-\-auto\-merge\fR
233 is supported and will only use
234 \fB\-\-auto\-merge\fR
235 when available\&. A value of
236 \fBfalse\fR
237 avoids using
238 \fB\-\-auto\-merge\fR
239 altogether, and is the default value\&.
240 .RE
241 .PP
242 mergetool\&.vimdiff\&.layout
243 .RS 4
244 The vimdiff backend uses this variable to control how its split windows look like\&. Applies even if you are using Neovim (\fBnvim\fR) or gVim (\fBgvim\fR) as the merge tool\&. See BACKEND SPECIFIC HINTS section for details\&.
245 .RE
246 .PP
247 mergetool\&.hideResolved
248 .RS 4
249 During a merge Git will automatically resolve as many conflicts as possible and write the
250 \fIMERGED\fR
251 file containing conflict markers around any conflicts that it cannot resolve;
252 \fILOCAL\fR
253 and
254 \fIREMOTE\fR
255 normally represent the versions of the file from before Git\(cqs conflict resolution\&. This flag causes
256 \fILOCAL\fR
257 and
258 \fIREMOTE\fR
259 to be overwritten so that only the unresolved conflicts are presented to the merge tool\&. Can be configured per\-tool via the
260 \fBmergetool\&.<tool>\&.hideResolved\fR
261 configuration variable\&. Defaults to
262 \fBfalse\fR\&.
263 .RE
264 .PP
265 mergetool\&.keepBackup
266 .RS 4
267 After performing a merge, the original file with conflict markers can be saved as a file with a
268 \fB\&.orig\fR
269 extension\&. If this variable is set to
270 \fBfalse\fR
271 then this file is not preserved\&. Defaults to
272 \fBtrue\fR
273 (i\&.e\&. keep the backup files)\&.
274 .RE
275 .PP
276 mergetool\&.keepTemporaries
277 .RS 4
278 When invoking a custom merge tool, Git uses a set of temporary files to pass to the tool\&. If the tool returns an error and this variable is set to
279 \fBtrue\fR, then these temporary files will be preserved, otherwise they will be removed after the tool has exited\&. Defaults to
280 \fBfalse\fR\&.
281 .RE
282 .PP
283 mergetool\&.writeToTemp
284 .RS 4
285 Git writes temporary
286 \fIBASE\fR,
287 \fILOCAL\fR, and
288 \fIREMOTE\fR
289 versions of conflicting files in the worktree by default\&. Git will attempt to use a temporary directory for these files when set
290 \fBtrue\fR\&. Defaults to
291 \fBfalse\fR\&.
292 .RE
293 .PP
294 mergetool\&.prompt
295 .RS 4
296 Prompt before each invocation of the merge resolution program\&.
297 .RE
298 .PP
299 mergetool\&.guiDefault
300 .RS 4
301 Set
302 \fBtrue\fR
303 to use the
304 \fBmerge\&.guitool\fR
305 by default (equivalent to specifying the
306 \fB\-\-gui\fR
307 argument), or
308 \fBauto\fR
309 to select
310 \fBmerge\&.guitool\fR
311 or
312 \fBmerge\&.tool\fR
313 depending on the presence of a
314 \fBDISPLAY\fR
315 environment variable value\&. The default is
316 \fBfalse\fR, where the
317 \fB\-\-gui\fR
318 argument must be provided explicitly for the
319 \fBmerge\&.guitool\fR
320 to be used\&.
321 .RE
322 .SH "TEMPORARY FILES"
323 .sp
324 \fBgit mergetool\fR creates \fB*\&.orig\fR backup files while resolving merges\&. These are safe to remove once a file has been merged and its \fBgit mergetool\fR session has completed\&.
325 .sp
326 Setting the \fBmergetool\&.keepBackup\fR configuration variable to \fBfalse\fR causes \fBgit mergetool\fR to automatically remove the backup as files are successfully merged\&.
327 .SH "BACKEND SPECIFIC HINTS"
328 .SS "vimdiff"
329 .sp
330 .it 1 an-trap
331 .nr an-no-space-flag 1
332 .nr an-break-flag 1
333 .br
334 .ps +1
335 \fBDescription\fR
336 .RS 4
337 .sp
338 When specifying \fB\-\-tool=vimdiff\fR in \fBgit mergetool\fR Git will open Vim with a 4 windows layout distributed in the following way:
339 .sp
340 .if n \{\
341 .RS 4
342 .\}
343 .nf
344 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
345 | | | |
346 | LOCAL | BASE | REMOTE |
347 | | | |
348 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
349 | |
350 | MERGED |
351 | |
352 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
353 .fi
354 .if n \{\
355 .RE
356 .\}
357 .sp
358 \fBLOCAL\fR, \fBBASE\fR and \fBREMOTE\fR are read\-only buffers showing the contents of the conflicting file in specific commits ("commit you are merging into", "common ancestor commit" and "commit you are merging from" respectively)
359 .sp
360 \fBMERGED\fR is a writable buffer where you have to resolve the conflicts (using the other read\-only buffers as a reference)\&. Once you are done, save and exit Vim as usual (\fB:wq\fR) or, if you want to abort, exit using \fB:cq\fR\&.
361 .RE
362 .sp
363 .it 1 an-trap
364 .nr an-no-space-flag 1
365 .nr an-break-flag 1
366 .br
367 .ps +1
368 \fBLayout configuration\fR
369 .RS 4
370 .sp
371 You can change the windows layout used by Vim by setting configuration variable \fBmergetool\&.vimdiff\&.layout\fR which accepts a string where the following separators have special meaning:
372 .sp
373 .RS 4
374 .ie n \{\
375 \h'-04'\(bu\h'+03'\c
376 .\}
377 .el \{\
378 .sp -1
379 .IP \(bu 2.3
380 .\}
381 \fB+\fR
382 is used to "open a new tab"
383 .RE
384 .sp
385 .RS 4
386 .ie n \{\
387 \h'-04'\(bu\h'+03'\c
388 .\}
389 .el \{\
390 .sp -1
391 .IP \(bu 2.3
392 .\}
393 \fB,\fR
394 is used to "open a new vertical split"
395 .RE
396 .sp
397 .RS 4
398 .ie n \{\
399 \h'-04'\(bu\h'+03'\c
400 .\}
401 .el \{\
402 .sp -1
403 .IP \(bu 2.3
404 .\}
405 \fB/\fR
406 is used to "open a new horizontal split"
407 .RE
408 .sp
409 .RS 4
410 .ie n \{\
411 \h'-04'\(bu\h'+03'\c
412 .\}
413 .el \{\
414 .sp -1
415 .IP \(bu 2.3
416 .\}
417 \fB@\fR
418 is used to indicate which is the file containing the final version after solving the conflicts\&. If not present,
419 \fBMERGED\fR
420 will be used by default\&.
421 .RE
422 .sp
423 The precedence of the operators is this one (you can use parentheses to change it):
424 .sp
425 .if n \{\
426 .RS 4
427 .\}
428 .nf
429 `@` > `+` > `/` > `,`
430 .fi
431 .if n \{\
432 .RE
433 .\}
434 .sp
435 Let\(cqs see some examples to understand how it works:
436 .sp
437 .RS 4
438 .ie n \{\
439 \h'-04'\(bu\h'+03'\c
440 .\}
441 .el \{\
442 .sp -1
443 .IP \(bu 2.3
444 .\}
445 \fBlayout = "(LOCAL,BASE,REMOTE)/MERGED"\fR
446 .sp
447 This is exactly the same as the default layout we have already seen\&.
448 .sp
449 Note that
450 \fB/\fR
451 has precedence over
452 \fB,\fR
453 and thus the parenthesis are not needed in this case\&. The next layout definition is equivalent:
454 .sp
455 .if n \{\
456 .RS 4
457 .\}
458 .nf
459 layout = "LOCAL,BASE,REMOTE / MERGED"
460 .fi
461 .if n \{\
462 .RE
463 .\}
464 .RE
465 .sp
466 .RS 4
467 .ie n \{\
468 \h'-04'\(bu\h'+03'\c
469 .\}
470 .el \{\
471 .sp -1
472 .IP \(bu 2.3
473 .\}
474 \fBlayout = "LOCAL,MERGED,REMOTE"\fR
475 .sp
476 If, for some reason, we are not interested in the
477 \fBBASE\fR
478 buffer\&.
479 .sp
480 .if n \{\
481 .RS 4
482 .\}
483 .nf
484 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
485 | | | |
486 | | | |
487 | LOCAL | MERGED | REMOTE |
488 | | | |
489 | | | |
490 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
491 .fi
492 .if n \{\
493 .RE
494 .\}
495 .RE
496 .sp
497 .RS 4
498 .ie n \{\
499 \h'-04'\(bu\h'+03'\c
500 .\}
501 .el \{\
502 .sp -1
503 .IP \(bu 2.3
504 .\}
505 \fBlayout = "MERGED"\fR
506 .sp
507 Only the
508 \fBMERGED\fR
509 buffer will be shown\&. Note, however, that all the other ones are still loaded in vim, and you can access them with the "buffers" command\&.
510 .sp
511 .if n \{\
512 .RS 4
513 .\}
514 .nf
515 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
516 | |
517 | |
518 | MERGED |
519 | |
520 | |
521 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
522 .fi
523 .if n \{\
524 .RE
525 .\}
526 .RE
527 .sp
528 .RS 4
529 .ie n \{\
530 \h'-04'\(bu\h'+03'\c
531 .\}
532 .el \{\
533 .sp -1
534 .IP \(bu 2.3
535 .\}
536 \fBlayout = "@LOCAL,REMOTE"\fR
537 .sp
538 When
539 \fBMERGED\fR
540 is not present in the layout, you must "mark" one of the buffers with an asterisk\&. That will become the buffer you need to edit and save after resolving the conflicts\&.
541 .sp
542 .if n \{\
543 .RS 4
544 .\}
545 .nf
546 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
547 | | |
548 | | |
549 | | |
550 | LOCAL | REMOTE |
551 | | |
552 | | |
553 | | |
554 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
555 .fi
556 .if n \{\
557 .RE
558 .\}
559 .RE
560 .sp
561 .RS 4
562 .ie n \{\
563 \h'-04'\(bu\h'+03'\c
564 .\}
565 .el \{\
566 .sp -1
567 .IP \(bu 2.3
568 .\}
569 \fBlayout = "LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE"\fR
570 .sp
571 Three tabs will open: the first one is a copy of the default layout, while the other two only show the differences between (\fBBASE\fR
572 and
573 \fBLOCAL\fR) and (\fBBASE\fR
574 and
575 \fBREMOTE\fR) respectively\&.
576 .sp
577 .if n \{\
578 .RS 4
579 .\}
580 .nf
581 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
582 | <TAB #1> | TAB #2 | TAB #3 | |
583 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
584 | | | |
585 | LOCAL | BASE | REMOTE |
586 | | | |
587 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
588 | |
589 | MERGED |
590 | |
591 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
592 .fi
593 .if n \{\
594 .RE
595 .\}
596 .sp
597 .if n \{\
598 .RS 4
599 .\}
600 .nf
601 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
602 | TAB #1 | <TAB #2> | TAB #3 | |
603 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
604 | | |
605 | | |
606 | | |
607 | BASE | LOCAL |
608 | | |
609 | | |
610 | | |
611 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
612 .fi
613 .if n \{\
614 .RE
615 .\}
616 .sp
617 .if n \{\
618 .RS 4
619 .\}
620 .nf
621 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
622 | TAB #1 | TAB #2 | <TAB #3> | |
623 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
624 | | |
625 | | |
626 | | |
627 | BASE | REMOTE |
628 | | |
629 | | |
630 | | |
631 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
632 .fi
633 .if n \{\
634 .RE
635 .\}
636 .RE
637 .sp
638 .RS 4
639 .ie n \{\
640 \h'-04'\(bu\h'+03'\c
641 .\}
642 .el \{\
643 .sp -1
644 .IP \(bu 2.3
645 .\}
646 \fBlayout = "LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE + (LOCAL/BASE/REMOTE),MERGED"\fR
647 .sp
648 Same as the previous example, but adds a fourth tab with the same information as the first tab, with a different layout\&.
649 .sp
650 .if n \{\
651 .RS 4
652 .\}
653 .nf
654 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
655 | TAB #1 | TAB #2 | TAB #3 | <TAB #4> |
656 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
657 | LOCAL | |
658 |\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-| |
659 | BASE | MERGED |
660 |\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-| |
661 | REMOTE | |
662 \-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-
663 .fi
664 .if n \{\
665 .RE
666 .\}
667 .sp
668 Note how in the third tab definition we need to use parenthesis to make
669 \fB,\fR
670 have precedence over
671 \fB/\fR\&.
672 .RE
673 .RE
674 .sp
675 .it 1 an-trap
676 .nr an-no-space-flag 1
677 .nr an-break-flag 1
678 .br
679 .ps +1
680 \fBVariants\fR
681 .RS 4
682 .sp
683 Instead of \fB\-\-tool=vimdiff\fR, you can also use one of these other variants:
684 .sp
685 .RS 4
686 .ie n \{\
687 \h'-04'\(bu\h'+03'\c
688 .\}
689 .el \{\
690 .sp -1
691 .IP \(bu 2.3
692 .\}
693 \fB\-\-tool=gvimdiff\fR, to open gVim instead of Vim\&.
694 .RE
695 .sp
696 .RS 4
697 .ie n \{\
698 \h'-04'\(bu\h'+03'\c
699 .\}
700 .el \{\
701 .sp -1
702 .IP \(bu 2.3
703 .\}
704 \fB\-\-tool=nvimdiff\fR, to open Neovim instead of Vim\&.
705 .RE
706 .sp
707 When using these variants, in order to specify a custom layout you will have to set configuration variables \fBmergetool\&.gvimdiff\&.layout\fR and \fBmergetool\&.nvimdiff\&.layout\fR instead of \fBmergetool\&.vimdiff\&.layout\fR
708 .sp
709 In addition, for backwards compatibility with previous Git versions, you can also append \fB1\fR, \fB2\fR or \fB3\fR to either \fBvimdiff\fR or any of the variants (ex: \fBvimdiff3\fR, \fBnvimdiff1\fR, etc\&...) to use a predefined layout\&. In other words, using \fB\-\-tool=[g,n,]vimdiffx\fR is the same as using \fB\-\-tool=[g,n,]vimdiff\fR and setting configuration variable \fBmergetool\&.[g,n,]vimdiff\&.layout\fR to\&...
710 .sp
711 .RS 4
712 .ie n \{\
713 \h'-04'\(bu\h'+03'\c
714 .\}
715 .el \{\
716 .sp -1
717 .IP \(bu 2.3
718 .\}
719 \fBx=1\fR:
720 \fB"@LOCAL, REMOTE"\fR
721 .RE
722 .sp
723 .RS 4
724 .ie n \{\
725 \h'-04'\(bu\h'+03'\c
726 .\}
727 .el \{\
728 .sp -1
729 .IP \(bu 2.3
730 .\}
731 \fBx=2\fR:
732 \fB"LOCAL, MERGED, REMOTE"\fR
733 .RE
734 .sp
735 .RS 4
736 .ie n \{\
737 \h'-04'\(bu\h'+03'\c
738 .\}
739 .el \{\
740 .sp -1
741 .IP \(bu 2.3
742 .\}
743 \fBx=3\fR:
744 \fB"MERGED"\fR
745 .RE
746 .sp
747 Example: using \fB\-\-tool=gvimdiff2\fR will open \fBgvim\fR with three columns (LOCAL, MERGED and REMOTE)\&.
748 .RE
749 .SH "GIT"
750 .sp
751 Part of the \fBgit\fR(1) suite