15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
The text can be freely edited. Use escape key to get focus out of the text
window to allow navigating as described above.
The status bar show basic info about the selected difference. A conflict
is marked with ***. Hover over the status line to get more info.
When saving, if no output file has been previously been selected, you get the
choise to overwrite either side or browse for another file.
The following command line parameters are merge related:
-a <file> : Ancestor file for threeway merge.
-o <file> : Output file for merge result.
-fine : Use fine grained chunks. Left/right choice is made per line instead of per chunk.
-conflict : Treat input file as a file with merge conflict markers.
|
|
|
|
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
|
The text can be freely edited. Use escape key to get focus out of the text
window to allow navigating as described above.
The status bar show basic info about the selected difference. A conflict
is marked with ***. Hover over the status line to get more info.
When saving, if no output file has been previously been selected, you get the
choice to overwrite either side or browse for another file.
The following command line parameters are merge related:
-a <file> : Ancestor file for three-way merge.
-o <file> : Output file for merge result.
-fine : Use fine grained chunks. Left/right choice is made per line instead of per chunk.
-conflict : Treat input file as a file with merge conflict markers.
|