Mercurial > hg
annotate tests/test-1102.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 | f2719b387380 |
children |
rev | line source |
---|---|
11847 | 1 $ rm -rf a |
2 $ hg init a | |
3 $ cd a | |
4 $ echo a > a | |
5 $ hg ci -Am0 | |
6 adding a | |
7 $ hg tag t1 # 1 | |
8 $ hg tag --remove t1 # 2 | |
6671
938eddd76237
tag: record tag we're superseding, if any (issue 1102)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
9 |
11847 | 10 $ hg co 1 |
11 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
13135
1c1ca9d393f4
tag: abort if not at a branch head (issue2552)
Kevin Bullock <kbullock@ringworld.org>
parents:
11847
diff
changeset
|
12 $ hg tag -f -r0 t1 |
11847 | 13 $ hg tags |
14 tip 3:a49829c4fc11 | |
15 t1 0:f7b1eb17ad24 | |
6671
938eddd76237
tag: record tag we're superseding, if any (issue 1102)
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
16 |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
13135
diff
changeset
|
17 $ cd .. |