You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

testParse_CcNewFile.patch 300B

1234567891011121314
  1. commit 6cb8160a4717d51fd3cc0baf721946daa60cf921
  2. Merge: 5c19b43... 13a2c0d...
  3. Author: Shawn O. Pearce <sop@google.com>
  4. Date: Fri Dec 12 13:26:52 2008 -0800
  5. Merge branch 'b' into d
  6. diff --cc d
  7. index 0000000,0000000..4bcfe98
  8. new file mode 100644
  9. --- /dev/null
  10. +++ b/d
  11. @@@ -1,0 -1,0 +1,1 @@@
  12. ++d