summaryrefslogtreecommitdiff
path: root/mergetools/diffmerge
diff options
context:
space:
mode:
Diffstat (limited to 'mergetools/diffmerge')
-rw-r--r--mergetools/diffmerge1
1 files changed, 0 insertions, 1 deletions
diff --git a/mergetools/diffmerge b/mergetools/diffmerge
index 85ac720157..f138cb4e73 100644
--- a/mergetools/diffmerge
+++ b/mergetools/diffmerge
@@ -11,5 +11,4 @@ merge_cmd () {
"$merge_tool_path" --merge \
--result="$MERGED" "$LOCAL" "$REMOTE"
fi
- status=$?
}