doc/hgmerge.1.txt
changeset 1341 3ab6e55ee361
parent 466 c084cfbb2389
child 2859 345bac2bc4ec
equal deleted inserted replaced
1340:faa62c7685fb 1341:3ab6e55ee361
    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 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).