Mercurial > hg
comparison tests/test-merge-tools.t @ 26730:a1e43e85d294
merge-tools: allow marking a mergetool as completely disabled
Very often in my life I'm finding that the only configured merge tool
present on the system is vimdiff[0], and it's currently impossible (as
far as I can tell) short of specifying `ui.merge = `[1] to actually
*disable* a merge tool. This allows vimdiff-haters to put:
[merge-tools]
vimdiff.disable = yes
in their ~/.hgrc and never see vimdiff again. I'm stopping short of
putting this as a commented out entry in the sample new user hgrc
(seen when a user runs `hg config --edit` with no ~/.hgrc) for now,
but I might come back and do that later.
0: vimdiff is at an awkward intersection: it's usually installed by
the vim package which is often installed as a vi substitute, so it's
mere presence doesn't imply me wanting it, unlike (say) kdiff3.
1: There's a related problem I ran into today where specifying
`ui.merge = :merge` failed because :merge isn't a command, which I
think is a regression. I'll try and figure that out and at least file
a bug.
author | Augie Fackler <augie@google.com> |
---|---|
date | Wed, 14 Oct 2015 12:57:33 -0400 |
parents | ef1eb6df7071 |
children | da1c706c9a35 |
comparison
equal
deleted
inserted
replaced
26729:16e69e6b357b | 26730:a1e43e85d294 |
---|---|
178 [merge-tools] | 178 [merge-tools] |
179 false.whatever= | 179 false.whatever= |
180 true.priority=1 | 180 true.priority=1 |
181 # hg update -C 1 | 181 # hg update -C 1 |
182 $ hg merge -r 2 --config merge-tools.false.priority=117 | 182 $ hg merge -r 2 --config merge-tools.false.priority=117 |
183 merging f | |
184 merging f failed! | |
185 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
186 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | |
187 [1] | |
188 $ aftermerge | |
189 # cat f | |
190 revision 1 | |
191 space | |
192 # hg stat | |
193 M f | |
194 ? f.orig | |
195 | |
196 or true set to disabled: | |
197 $ beforemerge | |
198 [merge-tools] | |
199 false.whatever= | |
200 true.priority=1 | |
201 # hg update -C 1 | |
202 $ hg merge -r 2 --config merge-tools.true.disabled=yes | |
183 merging f | 203 merging f |
184 merging f failed! | 204 merging f failed! |
185 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 205 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
186 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | 206 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon |
187 [1] | 207 [1] |