diff options
Diffstat (limited to 'git-prompt.sh')
| -rw-r--r-- | git-prompt.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-prompt.sh b/git-prompt.sh index cac80f8..d21786a 100644 --- a/git-prompt.sh +++ b/git-prompt.sh @@ -373,7 +373,7 @@ parse_git_dir() { elif [[ "$op" ]]; then branch="$op:$branch" if [[ "$op" == "merge" ]] ; then - branch+="<~$(git name-rev --name-only $(<$git_dir/MERGE_HEAD))" + branch+="<--$(git name-rev --name-only $(<$git_dir/MERGE_HEAD))" fi #branch="<$branch>" fi |