• Show log

    Commit

  • Hash : 521c0cab
    Author : Carlos Martín Nieto
    Date : 2014-11-02T17:18:19

    merge: talk about the merging state after git_merge()
    
    Since it's not necessarily obvious, mention the merging state and how to
    clear it.