gwh/slackbuilds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove redundant functions from merge command.

Browse source
This commit is contained in:
Phil Jackson 2010-09-03 20:17:17 +01:00
parent cb20289fc9
commit 9522698ce5
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
magit.el
View file

@ -2689,9 +2689,6 @@ With a prefix-arg, the merge will be squashed.
(magit-guess-branch))))
(if revision
(magit-run-git "merge" "--no-commit"
(if current-prefix-arg
"--squash"
"--no-ff")
(magit-rev-to-git revision))))
(magit-define-command automatic-merge (revision)