doc/hgmerge.1.txt
changeset 2859 345bac2bc4ec
parent 1341 3ab6e55ee361
child 4635 63b9d2deed48
equal deleted inserted replaced
2858:c9b08cacf983 2859:345bac2bc4ec
    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 Matt Mackall.
    33 Copyright \(C) 2005, 2006 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).