Mercurial > hg
comparison mercurial/filemerge.py @ 12184:025ca07351ea stable
convert: show example splice, author, and branch map entries in help
Also document that
- empty lines are skipped and comment are supported in author map
- whitespace is not allowed in branch map entries since we split on it
when parsing the file
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Fri, 10 Sep 2010 00:22:46 +0200 |
parents | 8e7960feb139 |
children | dee1901a0ed8 |
comparison
equal
deleted
inserted
replaced
12170:581066a319e5 | 12184:025ca07351ea |
---|