Proof of concept to reproduce https://github.com/twolfson/sexy-bash-prompt/issues/25

README.md

Steps to reproduce merged yet clean state

# Clone the repo
git clone https://gist.github.com/8950891.git gist-sexy-bash-prompt-merge-status
cd gist-sexy-bash-prompt-merge-status/

# On a new branch, make a commit
git checkout -b dev/ahead.a
echo "Goodbye Moon" > a.txt
git add -A
git commit -m "Saying goodbye moon"

# On another branch, make a conflicting commit
git checkout master
git checkout -b dev/ahead.b
echo "Goodbye Sun" > a.txt
git add -A
git commit -m "Saying goodbye sun"

# Move to a conflict resolution branch (unnecessary)
git checkout -b dev/conflict

# Introduce our conflict and resolve with HEAD
git merge dev/ahead.a
git checkout HEAD -- a.txt

# We are in merge conflict state but porcelain is empty
git status
git status --porcelain
echo $?

a.txt

Hello World!