From 79d6ebbfc52d564a6adff5a368b44c10cfa2d441 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Thu, 4 Sep 2014 15:59:37 +0400 Subject: [PATCH] IDEA-108491: add workaround for merge application --- platform/platform-resources/src/launcher.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/platform/platform-resources/src/launcher.py b/platform/platform-resources/src/launcher.py index 0a679eec98fe..f04a26cb2c83 100644 --- a/platform/platform-resources/src/launcher.py +++ b/platform/platform-resources/src/launcher.py @@ -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 \n' + \ + ' {0} merge [base] ').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) \ No newline at end of file