Mercurial > hg

comparison hgext/fetch.py @ 10973:49a07f441496

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use hg role in help strings
author Martin Geisler <mg@aragost.com>
date Thu, 22 Apr 2010 10:24:49 +0200
parents 612c142b7a82
children d1908cb95a82
comparison
equal deleted inserted replaced
10972:0a2c6948f5f4 10973:49a07f441496
26 When a merge occurs, the newly pulled changes are assumed to be 26 When a merge occurs, the newly pulled changes are assumed to be
27 "authoritative". The head of the new changes is used as the first 27 "authoritative". The head of the new changes is used as the first
28 parent, with local changes as the second. To switch the merge 28 parent, with local changes as the second. To switch the merge
29 order, use --switch-parent. 29 order, use --switch-parent.
30 30
31 See 'hg help dates' for a list of formats valid for -d/--date. 31 See :hg:`help dates` for a list of formats valid for -d/--date.
32 ''' 32 '''
33 33
34 date = opts.get('date') 34 date = opts.get('date')
35 if date: 35 if date:
36 opts['date'] = util.parsedate(date) 36 opts['date'] = util.parsedate(date)