Missing stuff

[ojura]

• merging: git merge --abort, git diff ...other, git merge --continue instead of git commit?
• git merge --abort
• last task should be in parallel for mirko and slavko
• git checkout <commit> and branching from there
• git branch -a
• pull before you start working!

[dmiklic]

+1
Another thing I was wondering about is where are successfully merged changes visible during a merge with conflicts. Is there a way to show their diff?

Also, I suggest renaming this issue to explicitly mention the merge verb.