Skip to content

Commit 1e86d5b

Browse files
davvidgitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 98a2602 commit 1e86d5b

File tree

3 files changed

+0
-3
lines changed

3 files changed

+0
-3
lines changed

mergetools/diffmerge

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,4 @@ merge_cmd () {
1111
"$merge_tool_path" --merge \
1212
--result="$MERGED" "$LOCAL" "$REMOTE"
1313
fi
14-
status=$?
1514
}

mergetools/emerge

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ merge_cmd () {
1515
"$LOCAL" "$REMOTE" \
1616
"$(basename "$MERGED")"
1717
fi
18-
status=$?
1918
}
2019

2120
translate_merge_tool_path() {

mergetools/kdiff3

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ merge_cmd () {
2020
-o "$MERGED" "$LOCAL" "$REMOTE" \
2121
>/dev/null 2>&1
2222
fi
23-
status=$?
2423
}

0 commit comments

Comments
 (0)