From a4b66b770386ddb699574b28cd0a86a7c88ecc66 Mon Sep 17 00:00:00 2001
From: Shenghou Ma <minux.ma@gmail.com>
Date: Mon, 9 Dec 2013 23:46:21 -0500
Subject: [PATCH] os: fix build. CL 36800043 and CL 36930044 have a merge
 conflict that I overlooked.

R=golang-dev
CC=golang-dev
https://golang.org/cl/39850043
---
 src/pkg/os/file.go | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/pkg/os/file.go b/src/pkg/os/file.go
index 18cd61d3a8..b4a7458016 100644
--- a/src/pkg/os/file.go
+++ b/src/pkg/os/file.go
@@ -250,3 +250,8 @@ func Create(name string) (file *File, err error) {
 
 // lstat is overridden in tests.
 var lstat = Lstat
+
+// Rename renames (moves) a file. OS-specific restrictions might apply.
+func Rename(oldpath, newpath string) error {
+	return rename(oldpath, newpath)
+}
-- 
2.48.1