doc/hgmerge.1.txt
changeset 4635 63b9d2deed48
parent 2859 345bac2bc4ec
equal deleted inserted replaced
4634:73bf2b586f3f 4635:63b9d2deed48
    28 --------
    28 --------
    29 hg(1) - the command line interface to Mercurial SCM
    29 hg(1) - the command line interface to Mercurial SCM
    30 
    30 
    31 COPYING
    31 COPYING
    32 -------
    32 -------
    33 Copyright \(C) 2005, 2006 Matt Mackall.
    33 Copyright \(C) 2005-2007 Matt Mackall.
    34 Free use of this software is granted under the terms of the GNU General
    34 Free use of this software is granted under the terms of the GNU General
    35 Public License (GPL).
    35 Public License (GPL).