From 2262d33832076ea2f2153a44bc8ee9632844495e Mon Sep 17 00:00:00 2001 From: Jonas Fonseca Date: Tue, 13 Jan 2009 18:41:37 +0100 Subject: [PATCH] Launch mergetool from the project root directory Fixes problem when in a subdirectory. --- NEWS | 1 + tig.c | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 31ef9d5..0564183 100644 --- a/NEWS +++ b/NEWS @@ -28,6 +28,7 @@ Bug fixes: - Status & stage view: refuse to open directories and deleted files. - Tree view: show error when requesting blame for all non-file entries. - Do not draw loading views, which are not displayed. + - Fix launching of mergetool from a subdirectory. tig-0.12.1 ---------- diff --git a/tig.c b/tig.c index 3098308..7a3ed2c 100644 --- a/tig.c +++ b/tig.c @@ -2931,7 +2931,7 @@ open_mergetool(const char *file) { const char *mergetool_argv[] = { "git", "mergetool", file, NULL }; - open_external_viewer(mergetool_argv, NULL); + open_external_viewer(mergetool_argv, opt_cdup); } static void -- 2.30.2