Skip to content

GitLab

Commit 7cdb6d66 authored by Robby Russell's avatar Robby Russell
Browse files

Resolving conflict when merging in 1570

parents d6a36b17 9245a308
Show whitespace changes
Inline Side-by-side
lib/git.zsh
View file @ 7cdb6d66
...@@ -20,7 +20,7 @@ parse_git_dirty() { ...@@ -20,7 +20,7 @@ parse_git_dirty() {
else else
GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1) GIT_STATUS=$(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null | tail -n1)
fi fi
if [[ -n $GIT_STATUS && "$GIT_STATUS" != "$CLEAN_MESSAGE" ]]; then if [[ -n $(git status -s ${SUBMODULE_SYNTAX} -uno 2> /dev/null) ]]; then
echo "$ZSH_THEME_GIT_PROMPT_DIRTY" echo "$ZSH_THEME_GIT_PROMPT_DIRTY"
else else
echo "$ZSH_THEME_GIT_PROMPT_CLEAN" echo "$ZSH_THEME_GIT_PROMPT_CLEAN"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment