summaryrefslogtreecommitdiff
path: root/mergetools
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2014-11-21 09:03:10 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-11-21 19:27:53 (GMT)
commit1e86d5b11dcf31adf11363caa1e96a94612b16f4 (patch)
tree87b8ace37e6972a15fc054987b4fbac3e420a918 /mergetools
parent98a260220c9b464dbefce1a23e4c89ed7b6ccb4d (diff)
downloadgit-1e86d5b11dcf31adf11363caa1e96a94612b16f4.zip
git-1e86d5b11dcf31adf11363caa1e96a94612b16f4.tar.gz
git-1e86d5b11dcf31adf11363caa1e96a94612b16f4.tar.bz2
mergetools: stop setting $status in merge_cmd()
No callers rely on $status so there's don't need to set it during merge_cmd() for diffmerge, emerge, and kdiff3. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools')
-rw-r--r--mergetools/diffmerge1
-rw-r--r--mergetools/emerge1
-rw-r--r--mergetools/kdiff31
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=$?
}