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>
David Aguilar committed
Nov 21, 2014 at 01:03 UTC
1e86d5b11dcf31adf11363caa1e96a94612b16f4
3 files changed
-3
mergetools/diffmerge
-1
@@ -11,5 +11,4 @@ merge_cmd () {
11
"$merge_tool_path" --merge \
12
--result="$MERGED" "$LOCAL" "$REMOTE"
13
fi
14
- status=$?
14
}
mergetools/emerge
-1
@@ -15,7 +15,6 @@ merge_cmd () {
15
"$LOCAL" "$REMOTE" \
16
"$(basename "$MERGED")"
17
fi
18
- status=$?
18
}
19
20
translate_merge_tool_path() {
mergetools/kdiff3
-1
@@ -20,5 +20,4 @@ merge_cmd () {
20
-o "$MERGED" "$LOCAL" "$REMOTE" \
21
>/dev/null 2>&1
22
fi
23
- status=$?
23
}