thodg/libgit2/tests/resources/mergedrepo/conflicts-one.txt

• Show log

  Commit

• Hash : 17820381
  Author :
  Date : 2013-11-14T14:05:52
  

  Rename tests-clar to tests

Download

• tests/resources/mergedrepo/conflicts-one.txt

• <<<<<<< HEAD
  This is most certainly a conflict!
  =======
  This is a conflict!!!
  >>>>>>> branch
  

Download