Show More
@@ -2062,7 +2062,7 b' def debugmergestate(ui, repo, *args, **o' | |||||
2062 | fm_files.data(renamed_path=state[1]) |
|
2062 | fm_files.data(renamed_path=state[1]) | |
2063 | fm_files.data(rename_side=state[2]) |
|
2063 | fm_files.data(rename_side=state[2]) | |
2064 | fm_extras = fm_files.nested(b'extras') |
|
2064 | fm_extras = fm_files.nested(b'extras') | |
2065 | for k, v in ms.extras(f).items(): |
|
2065 | for k, v in sorted(ms.extras(f).items()): | |
2066 | fm_extras.startitem() |
|
2066 | fm_extras.startitem() | |
2067 | fm_extras.data(key=k) |
|
2067 | fm_extras.data(key=k) | |
2068 | fm_extras.data(value=v) |
|
2068 | fm_extras.data(value=v) |
General Comments 0
You need to be logged in to leave comments.
Login now