MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-108491: add workaround for merge application

Browse Source
This commit is contained in:
Aleksey Pivovarov
2014-09-04 15:59:37 +04:00
parent 45ccfb1a90
commit 79d6ebbfc5
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/platform-resources/src/launcher.py
+5 -2
View File
@@ -18,10 +18,13 @@ for i, arg in enumerate(sys.argv[1:]):
print(('Usage:\n' + \
' {0} -h |-? | --help\n' + \
' {0} [-l|--line line] file[:line]\n' + \
' {0} diff file1 file2').format(sys.argv[0]))
' {0} diff <left> <right>\n' + \
' {0} merge <left> <right> [base] <result>').format(sys.argv[0]))
exit(0)
elif arg == 'diff' and i == 0:
args.append(arg)
elif arg == 'merge' and i == 0:
args.append(arg)
elif arg == '-l' or arg == '--line':
args.append(arg)
skip_next = True
@@ -96,4 +99,4 @@ else:
# unix common
bin_dir, bin_file = os.path.split(RUN_PATH)
os.chdir(bin_dir)
os.execv(bin_file, [bin_file] + args)
os.execv(bin_file, [bin_file] + args)