The tidy up of git mergetool's backup files handling made the two shell
functions save_backup and remove_backup redundant. This commit removes
these now unused functions.
Signed-off-by: Charles Bailey <charles@xxxxxxxxxxxxx>
---
This patch belongs on top of the mergetool updates in pu. It removes a
couple of shell functions which were made redundant in commit
6fef6e2... In fact it should logically be squashed into that commit.
git-mergetool.sh | 12 ------------
1 files changed, 0 insertions(+), 12 deletions(-)
diff --git a/git-mergetool.sh b/git-mergetool.sh
index d12bedf..5c86f69 100755
--- a/git-mergetool.sh
+++ b/git-mergetool.sh
@@ -127,18 +127,6 @@ check_unchanged () {
fi
}
-save_backup () {
- if test "$status" -eq 0; then
- mv -- "$BACKUP" "$MERGED.orig"
- fi
-}
-
-remove_backup () {
- if test "$status" -eq 0; then
- rm "$BACKUP"
- fi
-}
-
merge_file () {
MERGED="$1"
--
1.5.4.2.133.g3d51e
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
