view contrib/win32/mercurial.ini @ 5716:be367cbafe70

cmdutil: make bail_if_changed bail on uncommitted merge

; System-wide Mercurial config file.  To override these settings on a
; per-user basis, please edit the following file instead, where
; USERNAME is your Windows user name:
;   C:\Documents and Settings\USERNAME\Mercurial.ini

[ui]
editor = notepad

; By default, we try to encode and decode all files that do not
; contain ASCII NUL characters.  What this means is that we try to set
; line endings to Windows style on update, and to Unix style on
; commit.  This lets us cooperate with Linux and Unix users, so
; everybody sees files with their native line endings.

[extensions]
; The win32text extension is available and installed by default.  It
; provides built-in Python hooks to perform line ending conversions.
; This is normally much faster than running an external program.
hgext.win32text =


[encode]
; Encode files that don't contain NUL characters.

; ** = cleverencode:

; Alternatively, you can explicitly specify each file extension that
; you want encoded (any you omit will be left untouched), like this:

; *.txt = dumbencode:


[decode]
; Decode files that don't contain NUL characters.

; ** = cleverdecode:

; Alternatively, you can explicitly specify each file extension that
; you want decoded (any you omit will be left untouched), like this:

; **.txt = dumbdecode: