Re: [PATCH 2/2] created helper function for both winmerge and examdiff mergetools
From: Junio C Hamano <hidden>
Date: 2016-06-15 23:08:54
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH 2/2] created helper function for both winmerge and examdiff mergetools · Jacob Nisnevich <hidden>
Jacob Nisnevich [off-list ref] writes:
quoted hunk
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"