From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 23 Mar 2016 02:41:40 GMT
Subject: Re: [PATCH 2/2] created helper function for both winmerge and examdiff mergetools
Message-ID: <xmqqpoulex0b.fsf@gitster.mtv.corp.google.com>
In-Reply-To: <1458693794-9124-3-git-send-email-jacob.nisnevich@gmail.com>

Jacob Nisnevich <jacob.nisnevich@gmail.com> writes:

> diff --git a/mergetools/examdiff b/mergetools/examdiff
> index 474fffe..8b66c17 100644
> --- a/mergetools/examdiff
> +++ b/mergetools/examdiff
> @@ -1,3 +1,5 @@
> +. mergetools_helpers
> +

The way dot-inclusion is done in existing mergetools/* files may
give you a hint, perhaps?

$ git grep '^\. ' mergetools
mergetools/bc3:. "$MERGE_TOOLS_DIR/bc"
mergetools/gvimdiff:. "$MERGE_TOOLS_DIR/vimdiff"
mergetools/gvimdiff2:. "$MERGE_TOOLS_DIR/vimdiff"
mergetools/gvimdiff3:. "$MERGE_TOOLS_DIR/vimdiff"
mergetools/vimdiff2:. "$MERGE_TOOLS_DIR/vimdiff"
mergetools/vimdiff3:. "$MERGE_TOOLS_DIR/vimdiff"