##// END OF EJS Templates
Clarified message when nothing to merge is seen....
Clarified message when nothing to merge is seen. Sometimes there's a non-tip head waiting to be merged, especially after pulling in remote changes while there were local modifications in the working directory which had to be committed before 'hg merge' can work.

File last commit:

r1303:2dc06dd7 default
r2548:0229ff95 default
Show More
mercurial.ini
36 lines | 1.2 KiB | text/x-ini | IniLexer
; 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
; 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: