Mercurial > hg

diff Makefile @ 16126:0c4bec9596d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
filemerge: create detail of internal merge tools from documentation string this patch introduces 'internaltoolsmarker' which creates detail of each internal merge tools from documentation string for 'hg help merge-tools'.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sun, 12 Feb 2012 21:38:12 +0900
parents 3ca419fb435e
children d9e2f09d5488
line wrap: on
line diff
--- a/Makefile	Sun Feb 12 21:38:12 2012 +0900
+++ b/Makefile	Sun Feb 12 21:38:12 2012 +0900
@@ -91,8 +91,10 @@
 
 i18n/hg.pot: $(PYFILES) $(DOCFILES)
 	$(PYTHON) i18n/hggettext mercurial/commands.py \
-	  hgext/*.py hgext/*/__init__.py mercurial/fileset.py mercurial/revset.py \
+	  hgext/*.py hgext/*/__init__.py \
+	  mercurial/fileset.py mercurial/revset.py \
 	  mercurial/templatefilters.py mercurial/templatekw.py \
+	  mercurial/filemerge.py \
 	  $(DOCFILES) > i18n/hg.pot
         # All strings marked for translation in Mercurial contain
         # ASCII characters only. But some files contain string