Show More
@@ -151,10 +151,8 Test --per-file option: | |||
|
151 | 151 | Test --per-file option for gui tool: |
|
152 | 152 | |
|
153 | 153 | $ hg --config extdiff.gui.alabalaf=True alabalaf -c 6 --per-file --debug |
|
154 |
diffing |
|
|
155 |
diffing */extdiff.*/a.46c0e4daeb72/ |
|
|
156 | diffing "*\\extdiff.*\\a.46c0e4daeb72\\b" "a.81906f2b98ac\\b" (glob) (windows !) | |
|
157 | diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) (no-windows !) | |
|
154 | diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob) | |
|
155 | diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) | |
|
158 | 156 | making snapshot of 2 files from rev 46c0e4daeb72 |
|
159 | 157 | a |
|
160 | 158 | b |
@@ -169,10 +167,8 Test --per-file option for gui tool: | |||
|
169 | 167 | Test --per-file option for gui tool again: |
|
170 | 168 | |
|
171 | 169 | $ hg --config merge-tools.alabalaf.gui=True alabalaf -c 6 --per-file --debug |
|
172 |
diffing |
|
|
173 |
diffing */extdiff.*/a.46c0e4daeb72/ |
|
|
174 | diffing "*\\extdiff.*\\a.46c0e4daeb72\\b" "a.81906f2b98ac\\b" (glob) (windows !) | |
|
175 | diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) (no-windows !) | |
|
170 | diffing */extdiff.*/a.46c0e4daeb72/a a.81906f2b98ac/a (glob) | |
|
171 | diffing */extdiff.*/a.46c0e4daeb72/b a.81906f2b98ac/b (glob) | |
|
176 | 172 | making snapshot of 2 files from rev 46c0e4daeb72 |
|
177 | 173 | a |
|
178 | 174 | b |
General Comments 0
You need to be logged in to leave comments.
Login now