From 195f9647b3ad5b76f1229f28ddc93c470854c851 Mon Sep 17 00:00:00 2001
From: Nathan Broadbent <nathan.f77@gmail.com>
Date: Wed, 19 Oct 2011 17:49:43 +0800
Subject: [PATCH] test conflict

---
 git.scmbrc.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/git.scmbrc.example b/git.scmbrc.example
index 3044db6..82e6f80 100644
--- a/git.scmbrc.example
+++ b/git.scmbrc.example
@@ -24,7 +24,7 @@ git_index_alias="s"    # The 's' stands for 'switch' or 'sourcecode'...
 
 # Git Aliases
 # ------------------------------------------------------------------------------------
-git_alias="g"
+git_alias="git"
 
 # 1. 'SCM Breeze' functions
 git_status_shortcuts_alias="gs"