thodg/libgit2/tests-clar/resources/merge-resolve/conflicting.txt

• Show log

  Commit

• Hash : bec65a5e
  Author :
  Date : 2013-04-01T22:16:21
  

  merge!
  

Download

• tests-clar/resources/merge-resolve/conflicting.txt

• this file is changed in master and branch
  

Download