annotate contrib/win32/mercurial.ini @ 6429:532ca442b903

symmetricdifference: move back to copies It's too tightly dependent on known revlog ordering to fit well in ancestors
author Matt Mackall <mpm@selenic.com>
date Sat, 29 Mar 2008 12:39:47 -0500
parents 2ffe3e2a1ac2
children 8aa338cd0df3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4749
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
1 ; System-wide Mercurial config file. To override these settings on a
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
2 ; per-user basis, please edit the following file instead, where
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
3 ; USERNAME is your Windows user name:
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
4 ; C:\Documents and Settings\USERNAME\Mercurial.ini
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
5
5142
2ffe3e2a1ac2 merge with crew-stable
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4749 5081
diff changeset
6 [ui]
4749
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
7 editor = notepad
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
8
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
9 ; By default, we try to encode and decode all files that do not
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
10 ; contain ASCII NUL characters. What this means is that we try to set
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
11 ; line endings to Windows style on update, and to Unix style on
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
12 ; commit. This lets us cooperate with Linux and Unix users, so
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
13 ; everybody sees files with their native line endings.
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
14
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
15 [extensions]
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
16 ; The win32text extension is available and installed by default. It
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
17 ; provides built-in Python hooks to perform line ending conversions.
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
18 ; This is normally much faster than running an external program.
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
19 hgext.win32text =
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
20
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
21
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
22 [encode]
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
23 ; Encode files that don't contain NUL characters.
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
24
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
25 ; ** = cleverencode:
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
26
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
27 ; Alternatively, you can explicitly specify each file extension that
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
28 ; you want encoded (any you omit will be left untouched), like this:
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
29
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
30 ; *.txt = dumbencode:
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
31
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
32
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
33 [decode]
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
34 ; Decode files that don't contain NUL characters.
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
35
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
36 ; ** = cleverdecode:
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
37
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
38 ; Alternatively, you can explicitly specify each file extension that
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
39 ; you want decoded (any you omit will be left untouched), like this:
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
40
778bab992732 Convert default mercurial.ini file to Windows line endings
Lee Cantey <lcantey@gmail.com>
parents: 3432
diff changeset
41 ; **.txt = dumbdecode: