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