From: "lin.sun" <lin.sun@xxxxxxx>
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 <lin.sun@xxxxxxx>
---
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-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-git-781/sunlin7/master-v2
Pull-Request: https://github.com/git/git/pull/781
Range-diff vs v1:
1: 739e69e6631 ! 1: 6e98a10bfa9 Enable auto-merge for meld to follow the vim-diff beharior
@@ Commit message
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@xxxxxxxxx>
+ Signed-off-by: Lin Sun <lin.sun@xxxxxxx>
## mergetools/meld ##
@@ mergetools/meld: merge_cmd () {
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
