Mercurial > hg > mercurial-crew-with-dirclash

comparison doc/hgmerge.1.txt @ 3044:fcadf7a32425

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with mpm
author Josef "Jeff" Sipek <jeffpc@josefsipek.net>
date Sun, 03 Sep 2006 06:06:02 -0400
parents 345bac2bc4ec
children 63b9d2deed48
comparison
equal deleted inserted replaced
3043:2a4d4aecb2b4 3044:fcadf7a32425
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).