• Show log

    Commit

  • Hash : a291790a
    Author : Carlos Martín Nieto
    Date : 2015-02-15T05:18:01

    Merge pull request #2831 from ethomson/merge_lock merge: lock index during the merge (not just checkout)