Message ID | pull.781.git.git.1588901124066.gitgitgadget@gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Enable auto-merge for meld to follow the vim-diff beharior | expand |
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.
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 }