Mercurial > hg
annotate .hgtags @ 12765:5eed9ceebd64
merge: when --tool is specified, disable HGMERGE by setting to empty string
HGMERGE has different semantics than ui.merge. HGMERGE should hold the name
on an executable in your path, or an absolute tool path. As such, it's not
safe to simply copy the user's specified --tool value into HGMERGE. Instead,
we disable HGMERGE by setting it to an empty string.
author | Steve Borho <steve@borho.org> |
---|---|
date | Mon, 18 Oct 2010 23:20:14 -0500 |
parents | 80345db2b6a3 |
children | d0b08dcbcf0b |
rev | line source |
---|---|
66 | 1 d40cc5aacc31ed673d9b5b24f98bee78c283062c 0.4f |
2 1c590d34bf61e2ea12c71738e5a746cd74586157 0.4e | |
3 7eca4cfa8aad5fce9a04f7d8acadcd0452e2f34e 0.4d | |
4 b4d0c3786ad3e47beacf8412157326a32b6d25a4 0.4c | |
189 | 5 f40273b0ad7b3a6d3012fd37736d0611f41ecf54 0.5 |
194 | 6 0a28dfe59f8fab54a5118c5be4f40da34a53cdb7 0.5b |
458
ff8fbf99cd64
Added tag 0.6 for changeset 12e0fdbc57a0be78f0e817fd1d170a3615cd35da
mpm@selenic.com
parents:
194
diff
changeset
|
7 12e0fdbc57a0be78f0e817fd1d170a3615cd35da 0.6 |
685
79fb7032739f
Added tag 0.6b for changeset 4ccf3de52989b14c3d84e1097f59e39a992e00bd
Matt Mackall <mpm@selenic.com>
parents:
458
diff
changeset
|
8 4ccf3de52989b14c3d84e1097f59e39a992e00bd 0.6b |
972
0bc72d91aeda
Added tag 0.6c for changeset eac9c8efcd9bd8244e72fb6821f769f450457a32
mpm@selenic.com
parents:
685
diff
changeset
|
9 eac9c8efcd9bd8244e72fb6821f769f450457a32 0.6c |
1266
703783bc09c4
Added tag 0.7 for changeset 979c049974485125e1f9357f6bbe9c1b548a64c3
mpm@selenic.com
parents:
981
diff
changeset
|
10 979c049974485125e1f9357f6bbe9c1b548a64c3 0.7 |
1666
0fc1b588976f
Added tag 0.8 for changeset 3a56574f329a368d645853e0f9e09472aee62349
Matt Mackall <mpm@selenic.com>
parents:
1266
diff
changeset
|
11 3a56574f329a368d645853e0f9e09472aee62349 0.8 |
2052
c0b945c5df08
Added tag 0.8.1 for changeset 6a03cff2b0f5d30281e6addefe96b993582f2eac
Matt Mackall <mpm@selenic.com>
parents:
1666
diff
changeset
|
12 6a03cff2b0f5d30281e6addefe96b993582f2eac 0.8.1 |
2252
ba7afc7dd901
Added tag 0.9 for changeset 35fb62a3a673d5322f6274a44ba6456e5e4b3b37
Matt Mackall <mpm@selenic.com>
parents:
2052
diff
changeset
|
13 35fb62a3a673d5322f6274a44ba6456e5e4b3b37 0.9 |
2659
93b765f30c07
Added tag 0.9.1 for changeset 2be3001847cb18a23c403439d9e7d0ace30804e9
Matt Mackall <mpm@selenic.com>
parents:
2252
diff
changeset
|
14 2be3001847cb18a23c403439d9e7d0ace30804e9 0.9.1 |
3866
740b2a23c0db
Added tag 0.9.2 for changeset 36a957364b1b
Matt Mackall <mpm@selenic.com>
parents:
2659
diff
changeset
|
15 36a957364b1b89c150f2d0e60a99befe0ee08bd3 0.9.2 |
3924
b27f1da6ca88
Added tag 0.9.3 for changeset 27230c29bfec
Matt Mackall <mpm@selenic.com>
parents:
3866
diff
changeset
|
16 27230c29bfec36d5540fbe1c976810aefecfd1d2 0.9.3 |
4724
a084ed4b0c35
Added tag 0.9.4 for changeset fb4b6d5fe100
Matt Mackall <mpm@selenic.com>
parents:
3924
diff
changeset
|
17 fb4b6d5fe100b0886f8bc3d6731ec0e5ed5c4694 0.9.4 |
5473
040984468440
Added tag 0.9.5 for changeset 23889160905a
Matt Mackall <mpm@selenic.com>
parents:
4724
diff
changeset
|
18 23889160905a1b09fffe1c07378e9fc1827606eb 0.9.5 |
6387
cfa08c88a5c4
Added tag 1.0 for changeset bae2e9c838e9
Matt Mackall <mpm@selenic.com>
parents:
5473
diff
changeset
|
19 bae2e9c838e90a393bae3973a7850280413e091a 1.0 |
6623
58d4c6ae99f7
Added tag 1.0.1 for changeset d5cbbe2c49ce
Matt Mackall <mpm@selenic.com>
parents:
6387
diff
changeset
|
20 d5cbbe2c49cee22a9fbeb9ea41daa0ac4e26b846 1.0.1 |
6882
6ca12c67447c
Added tag 1.0.2 for changeset d2375bbee6d4
Matt Mackall <mpm@selenic.com>
parents:
6623
diff
changeset
|
21 d2375bbee6d47e62ba8e415c86e83a465dc4dce9 1.0.2 |
7462
40098e76d376
Added tag 1.1 for changeset 2a67430f92f1
Matt Mackall <mpm@selenic.com>
parents:
6882
diff
changeset
|
22 2a67430f92f15ea5159c26b09ec4839a0c549a26 1.1 |
7531
e9d21bbfd4cc
Added tag 1.1.1 for changeset 3773e510d433
Matt Mackall <mpm@selenic.com>
parents:
7462
diff
changeset
|
23 3773e510d433969e277b1863c317b674cbee2065 1.1.1 |
7555
5a6f417fa029
Added tag 1.1.2 for changeset 11a4eb81fb4f
Matt Mackall <mpm@selenic.com>
parents:
7531
diff
changeset
|
24 11a4eb81fb4f4742451591489e2797dc47903277 1.1.2 |
7824
0b5c7c239d29
Added tag 1.2 for changeset 11efa41037e2
Matt Mackall <mpm@selenic.com>
parents:
7555
diff
changeset
|
25 11efa41037e280d08cfb07c09ad485df30fb0ea8 1.2 |
7863
34eaa67fc7ea
Added tag 1.2.1 for changeset 02981000012e
Matt Mackall <mpm@selenic.com>
parents:
7824
diff
changeset
|
26 02981000012e3adf40c4849bd7b3d5618f9ce82d 1.2.1 |
9010
475a02734d84
Added tag 1.3 for changeset 196d40e7c885
Matt Mackall <mpm@selenic.com>
parents:
7863
diff
changeset
|
27 196d40e7c885fa6e95f89134809b3ec7bdbca34b 1.3 |
9191
0d7b21053805
Added tag 1.3.1 for changeset 3ef6c14a1e8e
Matt Mackall <mpm@selenic.com>
parents:
9010
diff
changeset
|
28 3ef6c14a1e8e83a31226f5881b7fe6095bbfa6f6 1.3.1 |
9870
f6a2dbbb0776
Added tag 1.4 for changeset 31ec469f9b55
Matt Mackall <mpm@selenic.com>
parents:
9191
diff
changeset
|
29 31ec469f9b556f11819937cf68ee53f2be927ebf 1.4 |
9986
6fa13bd71b20
Added tag 1.4.1 for changeset 439d7ea6fe3a
Matt Mackall <mpm@selenic.com>
parents:
9870
diff
changeset
|
30 439d7ea6fe3aa4ab9ec274a68846779153789de9 1.4.1 |
10193
36209ca38219
Added tag 1.4.2 for changeset 296a0b14a686
Matt Mackall <mpm@selenic.com>
parents:
9986
diff
changeset
|
31 296a0b14a68621f6990c54fdba0083f6f20935bf 1.4.2 |
10310
61750d3aa00c
Added tag 1.4.3 for changeset 4aa619c4c2c0
Matt Mackall <mpm@selenic.com>
parents:
10193
diff
changeset
|
32 4aa619c4c2c09907034d9824ebb1dd0e878206eb 1.4.3 |
10592
1875dc1ac5f4
Added tag 1.5 for changeset ff2704a8ded3
Matt Mackall <mpm@selenic.com>
parents:
10310
diff
changeset
|
33 ff2704a8ded37fbebd8b6eb5ec733731d725da8a 1.5 |
10811
644445eddf5c
Added tag 1.5.1 for changeset 2b01dab59416
Matt Mackall <mpm@selenic.com>
parents:
10592
diff
changeset
|
34 2b01dab594167bc0dd33331dbaa6dca3dca1b3aa 1.5.1 |
11081
831b1a740fa0
Added tag 1.5.2 for changeset 39f725929f0c
Matt Mackall <mpm@selenic.com>
parents:
10811
diff
changeset
|
35 39f725929f0c48c5fb3b90c071fc3066012456ca 1.5.2 |
11170
08578751a20f
Added tag 1.5.3 for changeset fdcf80f26604
Matt Mackall <mpm@selenic.com>
parents:
11081
diff
changeset
|
36 fdcf80f26604f233dc4d8f0a5ef9d7470e317e8a 1.5.3 |
11260
44546b8c588a
Added tag 1.5.4 for changeset 24fe2629c6fd
Matt Mackall <mpm@selenic.com>
parents:
11170
diff
changeset
|
37 24fe2629c6fd0c74c90bd066e77387c2b02e8437 1.5.4 |
11489
2ac897ef5219
Added tag 1.6 for changeset f786fc4b8764
Matt Mackall <mpm@selenic.com>
parents:
11260
diff
changeset
|
38 f786fc4b8764cd2a5526d259cf2f94d8a66924d9 1.6 |
11724
8a3d687713ee
Added tag 1.6.1 for changeset bf1774d95bde
Matt Mackall <mpm@selenic.com>
parents:
11489
diff
changeset
|
39 bf1774d95bde614af3956d92b20e2a0c68c5fec7 1.6.1 |
11737
1bb99194bedc
Added tag 1.6.2 for changeset c00f03a4982e
Matt Mackall <mpm@selenic.com>
parents:
11724
diff
changeset
|
40 c00f03a4982e467fb6b6bd45908767db6df4771d 1.6.2 |
12052
a4fc3444c542
Added tag 1.6.3 for changeset ff5cec76b1c5
Matt Mackall <mpm@selenic.com>
parents:
11737
diff
changeset
|
41 ff5cec76b1c5b6be9c3bb923aae8c3c6d079d6b9 1.6.3 |
12610
80345db2b6a3
Added tag 1.6.4 for changeset 93d8bff78c96
Matt Mackall <mpm@selenic.com>
parents:
12052
diff
changeset
|
42 93d8bff78c96fe7e33237b257558ee97290048a4 1.6.4 |