Show More
@@ -35,13 +35,14 b' There are a some internal merge tools wh' | |||||
35 | merge tools are: |
|
35 | merge tools are: | |
36 |
|
36 | |||
37 | ``internal:merge`` |
|
37 | ``internal:merge`` | |
38 |
Uses the internal non-interactive simple merge algorithm for merging |
|
38 | Uses the internal non-interactive simple merge algorithm for merging | |
39 |
It will fail if there are any conflicts |
|
39 | files. It will fail if there are any conflicts and leave markers in | |
|
40 | the partially merged file. | |||
40 |
|
41 | |||
41 | ``internal:fail`` |
|
42 | ``internal:fail`` | |
42 | Rather than attempting to merge files that were modified on both |
|
43 | Rather than attempting to merge files that were modified on both | |
43 |
branches, it marks the |
|
44 | branches, it marks them as unresolved. The resolve command must be | |
44 | command must be used to mark files resolved. |
|
45 | used to resolve these conflicts. | |
45 |
|
46 | |||
46 | ``internal:local`` |
|
47 | ``internal:local`` | |
47 | Uses the local version of files as the merged version. |
|
48 | Uses the local version of files as the merged version. |
General Comments 0
You need to be logged in to leave comments.
Login now