Show More
@@ -1037,7 +1037,7 b' Supported arguments:' | |||||
1037 | This tool can merge symlinks. (default: False) |
|
1037 | This tool can merge symlinks. (default: False) | |
1038 |
|
1038 | |||
1039 | ``check`` |
|
1039 | ``check`` | |
1040 |
A list of merge success-checking options: |
|
1040 | A list of merge success-checking options: | |
1041 |
|
1041 | |||
1042 | ``changed`` |
|
1042 | ``changed`` | |
1043 | Ask whether merge was successful when the merged file shows no changes. |
|
1043 | Ask whether merge was successful when the merged file shows no changes. |
General Comments 0
You need to be logged in to leave comments.
Login now