mirror of
https://github.com/facebook/sapling.git
synced 2024-10-11 09:17:30 +03:00
[githelp] Add mergetool git command
Summary: git mergetool ~ hg resolve Test Plan: $ hg githelp -- git mergetool a b hg resolve a b Reviewers: sid0, durham Reviewed By: durham Subscribers: #sourcecontrol Differential Revision: https://phabricator.fb.com/D1831922 Tasks: 6148855 Signature: t1:1831922:1423258373:915476235d4837b859584f4040dbfa2ad9970513
This commit is contained in:
parent
8683108d87
commit
96af3ce054
12
githelp.py
12
githelp.py
@ -519,6 +519,17 @@ def mergebase(ui, repo, *args, **kwargs):
|
||||
"Learn more about revsets with 'hg help revsets'\n\n")
|
||||
ui.status(cmd, "\n")
|
||||
|
||||
def mergetool(ui, repo, *args, **kwargs):
|
||||
cmdoptions = []
|
||||
args, opts = parseoptions(ui, cmdoptions, args)
|
||||
|
||||
cmd = Command("resolve")
|
||||
|
||||
if len(args) == 0:
|
||||
cmd['--all'] = None
|
||||
cmd.extend(args)
|
||||
ui.status(cmd, "\n")
|
||||
|
||||
def mv(ui, repo, *args, **kwargs):
|
||||
cmdoptions = [
|
||||
('f', 'force', None, ''),
|
||||
@ -851,6 +862,7 @@ gitcommands = {
|
||||
'ls-files': lsfiles,
|
||||
'merge': merge,
|
||||
'merge-base': mergebase,
|
||||
'mergetool': mergetool,
|
||||
'mv': mv,
|
||||
'pull': pull,
|
||||
'push': push,
|
||||
|
Loading…
Reference in New Issue
Block a user