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

• Show log

  Commit

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

  Rename tests-clar to tests

Download

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

• <<<<<<< HEAD
  This is without question another conflict!
  =======
  This is another conflict!!!
  >>>>>>> branch
  

Download