Mercurial > hgrepos > DevTools > mercurial-extensions
changeset 402:b3b3d47ad5a5
FIX: Typo in doc
| author | Franz Glasner <fzglas.hg@dom66.de> |
|---|---|
| date | Wed, 14 Aug 2019 09:21:24 +0200 |
| parents | 0761fbf2b01f |
| children | 9fc817315c5a |
| files | extensions/timestamps.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/extensions/timestamps.py Fri Aug 09 02:29:02 2019 +0200 +++ b/extensions/timestamps.py Wed Aug 14 09:21:24 2019 +0200 @@ -1245,7 +1245,7 @@ allow_other_region=False): """Restore file timestamps of files in iterable `candidates` that match `tsconfmatch` to the times in database `tsdb`. - `pats` are FILES from the command line are are (if not `None`) used + `pats` are FILES from the command line that are (if not `None`) used to filter the `candidates` too. If `alt` is given and one of "base", "local", "other" try to find a timestamp value from this merge conflict region if there is one.
