test conflict

This commit is contained in:
Nathan Broadbent
2011-10-19 17:49:43 +08:00
parent c45e0f79dc
commit 195f9647b3

View File

@@ -24,7 +24,7 @@ git_index_alias="s" # The 's' stands for 'switch' or 'sourcecode'...
# Git Aliases # Git Aliases
# ------------------------------------------------------------------------------------ # ------------------------------------------------------------------------------------
git_alias="g" git_alias="git"
# 1. 'SCM Breeze' functions # 1. 'SCM Breeze' functions
git_status_shortcuts_alias="gs" git_status_shortcuts_alias="gs"