On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: # HG changeset patch # User Alecs King <alecsk@gmail.com> On Sat, Jul 02, 2005 at 02:11:34PM -0700, Matt Mackall wrote: > On Sun, Jul 03, 2005 at 12:49:27AM +0800, Alecs King wrote: > > Hg is really very nice. The only feature i miss from git is the > > whatchanged -p, which shows a diff along with a changeset. > > python before, i just dig into the mercurial/commands.py a while and > > see what diff(), dodiff(), export(), show_changeset(), log() would > > normally do. There might be one thing or two missed or wrong. But here > > it is: a '-d' option to 'hg log' showing the diff info. You can use 'hg > > log -d' to show the whole history with the diff or 'hg log -d <file>' to > > show that info of a particular file. And also works with the '-r' > > option. > > Let's use -p. We're going to be combining the global and per command > switch namespace shortly and the global -p will disappear. Okay. '-d' changed to '-p'. Just like 'whatchanged -p', now we have 'hg log -p'. > Also, the argument list for show_changeset is getting a bit unwieldy. This time i remain show_changeset untouched at all. Only changed some bits of log().

     1

HGMERGE(1)

     2

==========

     3

Matt Mackall <mpm@selenic.com>

     4

v0.1, 27 May 2005

     5

     6

NAME

     7

----

     8

hgmerge - default wrapper to merge files in Mercurial SCM system

     9

    10

SYNOPSIS

    11

--------

    12

'hgmerge' local ancestor remote

    13

    14

DESCRIPTION

    15

-----------

    16

The hgmerge(1) command provides a graphical interface to merge files in the

    17

Mercurial system. It is a simple wrapper around kdiff3, merge(1) and tkdiff(1),

    18

or simply diff(1) and patch(1) depending on what is present on the system.

    19

    20

hgmerge(1) is used by the Mercurial SCM if the environment variable HGMERGE is

    21

not set.

    22

    23

AUTHOR

    24

------

    25

Written by Vincent Danjean <Vincent.Danjean@free.fr>

    26

    27

SEE ALSO

    28

--------

    29

hg(1) - the command line interface to Mercurial SCM

    30

    31

COPYING

    32

-------

    33

Copyright (C) 2005 Matt Mackall.

    34

Free use of this software is granted under the terms of the GNU General

    35

Public License (GPL).