equal
deleted
inserted
replaced
165 abort: tool 'alabalaf' requires a GUI |
165 abort: tool 'alabalaf' requires a GUI |
166 (to override, use: --config diff-tools.alabalaf.gui=False) |
166 (to override, use: --config diff-tools.alabalaf.gui=False) |
167 [255] |
167 [255] |
168 #endif |
168 #endif |
169 |
169 |
|
170 #if gui |
170 Test --per-file option for gui tool: |
171 Test --per-file option for gui tool: |
171 |
172 |
172 $ DISPLAY=fake hg --config extdiff.gui.alabalaf=True alabalaf -c 6 --per-file --debug |
173 $ DISPLAY=fake hg --config extdiff.gui.alabalaf=True alabalaf -c 6 --per-file --debug |
173 diffing */extdiff.*/a.46c0e4daeb72/* a.81906f2b98ac/* (glob) |
174 diffing */extdiff.*/a.46c0e4daeb72/* a.81906f2b98ac/* (glob) |
174 diffing */extdiff.*/a.46c0e4daeb72/* a.81906f2b98ac/* (glob) |
175 diffing */extdiff.*/a.46c0e4daeb72/* a.81906f2b98ac/* (glob) |
196 b |
197 b |
197 running '* diffing * *' in * (backgrounded) (glob) |
198 running '* diffing * *' in * (backgrounded) (glob) |
198 running '* diffing * *' in * (backgrounded) (glob) |
199 running '* diffing * *' in * (backgrounded) (glob) |
199 cleaning up temp directory |
200 cleaning up temp directory |
200 [1] |
201 [1] |
|
202 #endif |
201 |
203 |
202 Test --per-file and --confirm options: |
204 Test --per-file and --confirm options: |
203 |
205 |
204 $ hg --config ui.interactive=True falabala -c 6 --per-file --confirm <<EOF |
206 $ hg --config ui.interactive=True falabala -c 6 --per-file --confirm <<EOF |
205 > n |
207 > n |