diff options
Diffstat (limited to 'mergetools')
| -rw-r--r-- | mergetools/diffmerge | 1 | ||||
| -rw-r--r-- | mergetools/emerge | 1 | ||||
| -rw-r--r-- | mergetools/kdiff3 | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/mergetools/diffmerge b/mergetools/diffmerge index 85ac720..f138cb4 100644 --- a/mergetools/diffmerge +++ b/mergetools/diffmerge @@ -11,5 +11,4 @@ merge_cmd () { "$merge_tool_path" --merge \ --result="$MERGED" "$LOCAL" "$REMOTE" fi - status=$? } diff --git a/mergetools/emerge b/mergetools/emerge index f96d9e5..7b895fd 100644 --- a/mergetools/emerge +++ b/mergetools/emerge @@ -15,7 +15,6 @@ merge_cmd () { "$LOCAL" "$REMOTE" \ "$(basename "$MERGED")" fi - status=$? } translate_merge_tool_path() { diff --git a/mergetools/kdiff3 b/mergetools/kdiff3 index a30034f..793d129 100644 --- a/mergetools/kdiff3 +++ b/mergetools/kdiff3 @@ -20,5 +20,4 @@ merge_cmd () { -o "$MERGED" "$LOCAL" "$REMOTE" \ >/dev/null 2>&1 fi - status=$? } |