Show More
@@ -272,7 +272,7 b' def mergecopies(repo, c1, c2, ca):' | |||||
272 | if len(fl) == 2 and fl[0] == fl[1]: |
|
272 | if len(fl) == 2 and fl[0] == fl[1]: | |
273 | copy[fl[0]] = of # not actually divergent, just matching renames |
|
273 | copy[fl[0]] = of # not actually divergent, just matching renames | |
274 |
|
274 | |||
275 | if fullcopy: |
|
275 | if fullcopy and repo.ui.debugflag: | |
276 | repo.ui.debug(" all copies found (* = to merge, ! = divergent, " |
|
276 | repo.ui.debug(" all copies found (* = to merge, ! = divergent, " | |
277 | "% = renamed and deleted):\n") |
|
277 | "% = renamed and deleted):\n") | |
278 | for f in sorted(fullcopy): |
|
278 | for f in sorted(fullcopy): |
General Comments 0
You need to be logged in to leave comments.
Login now