* [PATCH] Enable auto-merge for meld to follow the vim-diff beharior
@ 2020-05-08 1:25 sunlin via GitGitGadget
2020-06-08 9:49 ` Pratyush Yadav
0 siblings, 1 reply; 4+ messages in thread
From: sunlin via GitGitGadget @ 2020-05-08 1:25 UTC (permalink / raw)
To: git; +Cc: sunlin, lin.sun
From: "lin.sun" <lin.sun@zoom.us>
The mergetool "meld" does NOT merge the no-conflict changes, while the
mergetool "vimdiff" will merge the no-conflict parts and highlight the
conflict parts.
This patch will make the mergetool "meld" similar to "vimdiff",
auto-merge the no-conflict parts, highlight conflict parts.
Signed-off-by: Lin Sun <sunlin7@yahoo.com>
---
Enable auto-merge for meld to follow the vimdiff beharior
Hi, the mergetool "meld" does NOT merge the no-conflict changes, while
the mergetool "vimdiff" will merge the no-conflict changes and highlight
the conflict parts. This patch will make the mergetool "meld" similar to
"vimdiff", auto-merge the no-conflict changes, highlight conflict parts.
Published-As: https://github.com/gitgitgadget/git/releases/tag/pr-git-781%2Fsunlin7%2Fmaster-v1
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v1
Pull-Request: https://github.com/git/git/pull/781
mergetools/meld | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/mergetools/meld b/mergetools/meld
index 7a08470f883..318653cc9f7 100644
--- a/mergetools/meld
+++ b/mergetools/meld
@@ -10,10 +10,10 @@ merge_cmd () {
if test "$meld_has_output_option" = true
then
- "$merge_tool_path" --output="$MERGED" \
+ "$merge_tool_path" --auto-merge --output="$MERGED" \
"$LOCAL" "$BASE" "$REMOTE"
else
- "$merge_tool_path" "$LOCAL" "$MERGED" "$REMOTE"
+ "$merge_tool_path" --auto-merge "$LOCAL" "$MERGED" "$REMOTE"
fi
}
base-commit: 07d8ea56f2ecb64b75b92264770c0a664231ce17
--
gitgitgadget
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] Enable auto-merge for meld to follow the vim-diff beharior
@ 2020-06-08 9:31 lin.sun
2020-06-08 9:33 ` lin.sun
0 siblings, 1 reply; 4+ messages in thread
From: lin.sun @ 2020-06-08 9:31 UTC (permalink / raw)
To: gitgitgadget, gitster; +Cc: git, lin.sun, sunlin7
Can anyone help to merge this patch please? Appreciate.
^ permalink raw reply [flat|nested] 4+ messages in thread
* RE: [PATCH] Enable auto-merge for meld to follow the vim-diff beharior
2020-06-08 9:31 [PATCH] Enable auto-merge for meld to follow the vim-diff beharior lin.sun
@ 2020-06-08 9:33 ` lin.sun
0 siblings, 0 replies; 4+ messages in thread
From: lin.sun @ 2020-06-08 9:33 UTC (permalink / raw)
To: gitgitgadget, gitster,
pull.781.git.git.1588901124066.gitgitgadget
Cc: git, sunlin7
https://lore.kernel.org/git/pull.781.git.git.1588901124066.gitgitgadget@gmail.com/
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Enable auto-merge for meld to follow the vim-diff beharior
2020-05-08 1:25 sunlin via GitGitGadget
@ 2020-06-08 9:49 ` Pratyush Yadav
0 siblings, 0 replies; 4+ messages in thread
From: Pratyush Yadav @ 2020-06-08 9:49 UTC (permalink / raw)
To: sunlin via GitGitGadget; +Cc: git, sunlin, lin.sun
Hi Lin,
I'm not familiar with the code so I'll let someone else comment on that.
But...
On 08/05/20 01:25AM, sunlin via GitGitGadget wrote:
> From: "lin.sun" <lin.sun@zoom.us>
>
> The mergetool "meld" does NOT merge the no-conflict changes, while the
> mergetool "vimdiff" will merge the no-conflict parts and highlight the
> conflict parts.
> This patch will make the mergetool "meld" similar to "vimdiff",
> auto-merge the no-conflict parts, highlight conflict parts.
>
> Signed-off-by: Lin Sun <sunlin7@yahoo.com>
... your name and email in "From:" and "Signed-off-by:" should be the
same. So either use "lin.sun" <lin.sun@zoom.us> in both places or use
Lin Sun <sunlin7@yahoo.com> in both.
--
Regards,
Pratyush Yadav
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-06-08 9:50 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-08 9:31 [PATCH] Enable auto-merge for meld to follow the vim-diff beharior lin.sun
2020-06-08 9:33 ` lin.sun
-- strict thread matches above, loose matches on Subject: below --
2020-05-08 1:25 sunlin via GitGitGadget
2020-06-08 9:49 ` Pratyush Yadav
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).