Mercurial > hg

diff doc/ja/hgmerge.1.ja.txt @ 2859:345bac2bc4ec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update copyrights.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Sat, 12 Aug 2006 12:30:02 -0700
parents 874efc57e00a
children 63b9d2deed48
line wrap: on
line diff
--- a/doc/ja/hgmerge.1.ja.txt	Sat Aug 12 12:12:23 2006 -0700
+++ b/doc/ja/hgmerge.1.ja.txt	Sat Aug 12 12:30:02 2006 -0700
@@ -32,6 +32,6 @@
 
 著作権情報
 ----
-Copyright (C) 2005 Matt Mackall.
+Copyright (C) 2005, 2006 Matt Mackall.
 このソフトウェアの自由な使用は GNU 一般公有使用許諾 (GPL) のもとで
 認められます。