gistfile1.txt

D:\workspace\BWP (master)
λ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 2 and 1 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

You are currently rebasing branch 'master' on '0b71b84'.
  (all conflicts fixed: run "git rebase --continue")

nothing to commit, working tree clean