-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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>
- Loading branch information
David Aguilar
authored and
Junio C Hamano
committed
Nov 21, 2014
1 parent
98a2602
commit 1e86d5b
Showing
3 changed files
with
0 additions
and
3 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -11,5 +11,4 @@ merge_cmd () { | |
"$merge_tool_path" --merge \ | ||
--result="$MERGED" "$LOCAL" "$REMOTE" | ||
fi | ||
status=$? | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,5 +20,4 @@ merge_cmd () { | |
-o "$MERGED" "$LOCAL" "$REMOTE" \ | ||
>/dev/null 2>&1 | ||
fi | ||
status=$? | ||
} |