projects / thirdparty / git.git / blame
| Commit | Line | Data |
|---|---|---|
| b80da424 | 1 | From: A U Thor <au.thor@example.com> |
| 2 | Date: Thu Dec 4 16:00:00 2008 -0800 | |
| 3 | Subject: Huh | |
| 4 | ||
| 5 | Should fail and leave rejects | |
| 6 | ||
| 7 | diff --git i/file-2 w/file-2 | |
| 8 | index 06e567b..b6f3a16 100644 | |
| 9 | --- i/file-2 | |
| 10 | +++ w/file-2 | |
| 11 | @@ -1,3 +1,3 @@ | |
| 12 | -0 | |
| 13 | +One | |
| 14 | 2 | |
| 15 | 3 | |
| 16 | @@ -4,4 +4,4 @@ | |
| 17 | 4 | |
| 18 | 5 | |
| 19 | -6 | |
| 20 | +Six | |
| 21 | 7 |