summaryrefslogtreecommitdiffstats
path: root/src/vars.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/vars.c')
-rw-r--r--src/vars.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/vars.c b/src/vars.c
index 52a1ed2..16b892a 100644
--- a/src/vars.c
+++ b/src/vars.c
@@ -126,7 +126,7 @@ struct dmon_conf dmon;
*/
void vars_init(void)
{
- const char *ed, *pg;
+ const char *ed, *pg, *mt;
/* Variables for user configuration */
conf.confirm_quit = 1;
@@ -159,6 +159,11 @@ void vars_init(void)
pg = DEFAULT_PAGER;
conf.pager = pg;
+ mt = getenv("MERGETOOL");
+ if (mt == NULL || mt[0] == '\0')
+ mt = DEFAULT_MERGETOOL;
+ conf.mergetool = mt;
+
wins_set_layout(1);
ui_calendar_set_first_day_of_week(MONDAY);