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

• Show log

  Commit

• Hash : f45ec1a0
  Author :
  Date : 2012-10-29T20:04:21
  

  index refactoring

Download

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

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

Download