Show More
| @@ -1028,7 +1028,6 b' def _maketempfiles(repo, fco, fca, local' | |||||
| 1028 | def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): |
|
1028 | def filemerge(repo, wctx, mynode, orig, fcd, fco, fca, labels=None): | |
| 1029 | """perform a 3-way merge in the working directory |
|
1029 | """perform a 3-way merge in the working directory | |
| 1030 |
|
1030 | |||
| 1031 | premerge = whether this is a premerge |
|
|||
| 1032 | mynode = parent node before merge |
|
1031 | mynode = parent node before merge | |
| 1033 | orig = original local filename before merge |
|
1032 | orig = original local filename before merge | |
| 1034 | fco = other file context |
|
1033 | fco = other file context | |
General Comments 0
You need to be logged in to leave comments.
Login now