17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
|
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
|
-
+
+
+
|
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.
From the The following command line parameters are merge related:
|