Launch mergetool from the project root directory

Fixes problem when in a subdirectory.

diff --git a/NEWS b/NEWS
index 31ef9d529126a042f47195c7e881d4321445ff38..05641831bd2de0c25e65296d6c5d2a56070b5436 100644 (file)
--- 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 30983081aba74847eaa8e346897eb7073c0a2b28..7a3ed2c867c79963fd14e8b8c7db122d71c063e8 100644 (file)
--- 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