tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Supply merge.tool option when merging

This commit is contained in:
ZyX 2014-11-30 03:42:17 +03:00
parent 4624a1dc86
commit 508f8f5eaa
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/powerline-release.py
View File

@ -50,7 +50,7 @@ def parse_version(s):
def merge(version_string, rev, **kwargs):
check_call(['git', 'checkout', 'master'])
check_call(['git', 'merge', '--no-ff', '--no-commit', '--log', rev])
check_call(['git', '-c', 'merge.tool=vimdiff', 'merge', '--no-ff', '--no-commit', '--log', rev])
with codecs.open('.setup.py.new', 'w', encoding='utf-8') as NS:
with codecs.open('setup.py', 'r', encoding='utf-8') as OS: