aboutsummaryrefslogtreecommitdiff
path: root/mergetools/kdiff3
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/kdiff3')
-rw-r--r--mergetools/kdiff31
1 files changed, 0 insertions, 1 deletions
diff --git a/mergetools/kdiff3 b/mergetools/kdiff3
index a30034f11..793d1293b 100644
--- a/mergetools/kdiff3
+++ b/mergetools/kdiff3
@@ -20,5 +20,4 @@ merge_cmd () {
-o "$MERGED" "$LOCAL" "$REMOTE" \
>/dev/null 2>&1
fi
- status=$?
}