work in progress
dont list merges
basic tests for git commit
commit
handling automerge and conflicts in concurrent edition
update locale es
succesful automerge also raises a message
new message
Merge branch 'git_concurrent_edition'
mention concurrent edition