diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 09:49:36 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-27 09:49:36 +0000 |
| commit | 5ec6074f0633939fd17d94111d10c6c6b062978c (patch) | |
| tree | bfaa17b5a64abc66c918e9c70969e519d9e1df8e /mergetools/diffmerge | |
| parent | Initial commit. (diff) | |
| download | git-5ec6074f0633939fd17d94111d10c6c6b062978c.tar.xz git-5ec6074f0633939fd17d94111d10c6c6b062978c.zip | |
Adding upstream version 1:2.30.2.upstream/1%2.30.2upstream
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'mergetools/diffmerge')
| -rw-r--r-- | mergetools/diffmerge | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/mergetools/diffmerge b/mergetools/diffmerge new file mode 100644 index 0000000..9b6355b --- /dev/null +++ b/mergetools/diffmerge @@ -0,0 +1,18 @@ +diff_cmd () { + "$merge_tool_path" "$LOCAL" "$REMOTE" >/dev/null 2>&1 +} + +merge_cmd () { + if $base_present + then + "$merge_tool_path" --merge --result="$MERGED" \ + "$LOCAL" "$BASE" "$REMOTE" + else + "$merge_tool_path" --merge \ + --result="$MERGED" "$LOCAL" "$REMOTE" + fi +} + +exit_code_trustable () { + true +} |