##// END OF EJS Templates
internal:merge: update documentation...
Pierre-Yves David -
r22027:b98e5c7a default
parent child Browse files
Show More
@@ -206,7 +206,8 b' def _imerge(repo, mynode, orig, fcd, fco'
206 """
206 """
207 Uses the internal non-interactive simple merge algorithm for merging
207 Uses the internal non-interactive simple merge algorithm for merging
208 files. It will fail if there are any conflicts and leave markers in
208 files. It will fail if there are any conflicts and leave markers in
209 the partially merged file."""
209 the partially merged file. Markers will have two sections, one for each side
210 of merge."""
210 tool, toolpath, binary, symlink = toolconf
211 tool, toolpath, binary, symlink = toolconf
211 if symlink:
212 if symlink:
212 repo.ui.warn(_('warning: internal:merge cannot merge symlinks '
213 repo.ui.warn(_('warning: internal:merge cannot merge symlinks '
General Comments 0
You need to be logged in to leave comments. Login now