From 972b9da3a340caf25cb346ac2be2aa1017b677e3 Mon Sep 17 00:00:00 2001
From: 10sr <8slashes+git@gmail.com>
Date: Thu, 27 Jun 2013 22:07:31 +0900
Subject: [PATCH] add GIT_MERGE_AUTOEDIT=no

---
 bashrc | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/bashrc b/bashrc
index ec5ae33..d2546e0 100755
--- a/bashrc
+++ b/bashrc
@@ -51,6 +51,9 @@ then
     PATH="${PATH}:${HOME}/.local/bin"
 fi
 
+export LANG=ja_JP.UTF-8
+export LC_MESSAGES=C
+
 if false iswindows
 then
     export PAGER='tr -d \\r | less'
@@ -71,12 +74,13 @@ then
 else
     export EDITOR=vi
 fi
-export LANG=ja_JP.UTF-8
-export LC_MESSAGES=C
 # export CDPATH=".:~"
 export VISUAL="$EDITOR"
+
 export GIT_PAGER="less -F"
 export GIT_EDITOR="$EDITOR"
+export GIT_MERGE_AUTOEDIT=no
+
 if test -n "$TMUX" && \
     echo $TERM | grep screen >/dev/null 2>&1 && \
     tmux display -p '#{client_termname}' | grep 256color >/dev/null 2>&1