Mercurial Repositories > eric / changeset
changeset
Merged with merge changes supplied by Christos Sevastiadisi.
Fri, 23 Aug 2019 12:41:00 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Fri, 23 Aug 2019 12:41:00 +0200
- changeset 7153
- ca02892fde13
- parent 7150
- cfe71cde2eec (diff)
- parent 7152
- a99df2004bb7 (current diff)
- child 7154
- 2d90de2056ec
Merged with merge changes supplied by Christos Sevastiadisi.
| eric6/Plugins/VcsPlugins/vcsMercurial/hg.py | file | annotate | diff | comparison | revisions |
--- a/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Aug 23 02:02:42 2019 +0300 +++ b/eric6/Plugins/VcsPlugins/vcsMercurial/hg.py Fri Aug 23 12:41:00 2019 +0200 @@ -514,7 +514,12 @@ if mq: args.append("--mq") elif merge: - ... + if author: + args.append("--user") + args.append(author) + if dateTime: + args.append("--date") + args.append(dateTime) else: if closeBranch: args.append("--close-branch")
