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/guiffy | |
| parent | Initial commit. (diff) | |
| download | git-8c76a719c62c2f3aec291063b6d4d5aaaab1c4ee.tar.xz git-8c76a719c62c2f3aec291063b6d4d5aaaab1c4ee.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/guiffy')
| -rw-r--r-- | mergetools/guiffy | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/mergetools/guiffy b/mergetools/guiffy new file mode 100644 index 0000000..8b23a13 --- /dev/null +++ b/mergetools/guiffy @@ -0,0 +1,18 @@ +diff_cmd () { + "$merge_tool_path" "$LOCAL" "$REMOTE" +} + +merge_cmd () { + if $base_present + then + "$merge_tool_path" -s "$LOCAL" \ + "$REMOTE" "$BASE" "$MERGED" + else + "$merge_tool_path" -m "$LOCAL" \ + "$REMOTE" "$MERGED" + fi +} + +exit_code_trustable () { + true +} |