Show More
@@ -167,8 +167,8 b' Test --per-file option for gui tool:' | |||||
167 | Test --per-file option for gui tool again: |
|
167 | Test --per-file option for gui tool again: | |
168 |
|
168 | |||
169 | $ 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 | |
170 |
diffing */extdiff.*/a.46c0e4daeb72/ |
|
170 | diffing */extdiff.*/a.46c0e4daeb72/* a.81906f2b98ac/* (glob) | |
171 |
diffing */extdiff.*/a.46c0e4daeb72/ |
|
171 | diffing */extdiff.*/a.46c0e4daeb72/* a.81906f2b98ac/* (glob) | |
172 | making snapshot of 2 files from rev 46c0e4daeb72 |
|
172 | making snapshot of 2 files from rev 46c0e4daeb72 | |
173 | a |
|
173 | a | |
174 | b |
|
174 | b |
General Comments 0
You need to be logged in to leave comments.
Login now