From b974bf54dc070b9b0fb5744dae54327238564d4e Mon Sep 17 00:00:00 2001
From: Sam Stephenson <sam@37signals.com>
Date: Sun, 30 Dec 2012 18:35:08 -0600
Subject: [PATCH] Prefer .ruby-version to .rbenv-version for reading local
 versions

---
 libexec/rbenv-version-file | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/libexec/rbenv-version-file b/libexec/rbenv-version-file
index 1beea0f0..2413834f 100755
--- a/libexec/rbenv-version-file
+++ b/libexec/rbenv-version-file
@@ -6,7 +6,10 @@ set -e
 find_local_version_file() {
   local root="$1"
   while [ -n "$root" ]; do
-    if [ -e "${root}/.rbenv-version" ]; then
+    if [ -e "${root}/.ruby-version" ]; then
+      echo "${root}/.ruby-version"
+      exit
+    elif [ -e "${root}/.rbenv-version" ]; then
       echo "${root}/.rbenv-version"
       exit
     fi