Re: [PATCH 2/2] created helper function for both winmerge and examdiff mergetools

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Jacob Nisnevich <jacob.nisnevich@xxxxxxxxx> 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"

--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]