Show More
@@ -200,6 +200,7 b' test-merge-closedheads.t' | |||||
200 | test-merge-commit.t |
|
200 | test-merge-commit.t | |
201 | test-merge-criss-cross.t |
|
201 | test-merge-criss-cross.t | |
202 | test-merge-default.t |
|
202 | test-merge-default.t | |
|
203 | test-merge-force.t | |||
203 | test-merge-internal-tools-pattern.t |
|
204 | test-merge-internal-tools-pattern.t | |
204 | test-merge-local.t |
|
205 | test-merge-local.t | |
205 | test-merge-remove.t |
|
206 | test-merge-remove.t |
@@ -66,7 +66,7 b' combinations = sorted(generatestates(max' | |||||
66 | content = [] |
|
66 | content = [] | |
67 | for filename, states in combinations: |
|
67 | for filename, states in combinations: | |
68 | if target == 'filelist': |
|
68 | if target == 'filelist': | |
69 | print(filename) |
|
69 | print(filename.decode('ascii')) | |
70 | elif target == 'state': |
|
70 | elif target == 'state': | |
71 | if depth == 'wc': |
|
71 | if depth == 'wc': | |
72 | # Make sure there is content so the file gets written and can be |
|
72 | # Make sure there is content so the file gets written and can be |
General Comments 0
You need to be logged in to leave comments.
Login now