diff options
| author | Vicent Martà <vicent@github.com> | 2013-06-12 14:52:47 -0700 |
|---|---|---|
| committer | Vicent Martà <vicent@github.com> | 2013-06-12 14:52:47 -0700 |
| commit | 93da7af707f7d6e9c466a319a7fa437883da7793 (patch) | |
| tree | 48f6d384f1ec242581a60528790e969dbf94eb06 /tests-clar/diff/rename.c | |
| parent | 5438e9c2b8eeb79c5580c576da6e110aa0cd2e59 (diff) | |
| parent | 360f42f4b3f5de31270416220bd799b951202b2d (diff) | |
| download | libgit2-93da7af707f7d6e9c466a319a7fa437883da7793.tar.gz | |
Merge pull request #1642 from arrbee/diff-function-context
Diff code reorg plus function context in diff headers
Diffstat (limited to 'tests-clar/diff/rename.c')
| -rw-r--r-- | tests-clar/diff/rename.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests-clar/diff/rename.c b/tests-clar/diff/rename.c index 8bff96cf2..ca3f50676 100644 --- a/tests-clar/diff/rename.c +++ b/tests-clar/diff/rename.c @@ -558,7 +558,7 @@ void test_diff_rename__patch(void) git_diff_patch *patch; const git_diff_delta *delta; char *text; - const char *expected = "diff --git a/sixserving.txt b/ikeepsix.txt\nindex ad0a8e5..36020db 100644\n--- a/sixserving.txt\n+++ b/ikeepsix.txt\n@@ -1,3 +1,6 @@\n+I Keep Six Honest Serving-Men\n+=============================\n+\n I KEEP six honest serving-men\n (They taught me all I knew);\n Their names are What and Why and When\n@@ -21,4 +24,4 @@\n One million Hows, two million Wheres,\n And seven million Whys!\n \n- -- Rudyard Kipling\n+ -- Rudyard Kipling\n"; + const char *expected = "diff --git a/sixserving.txt b/ikeepsix.txt\nindex ad0a8e5..36020db 100644\n--- a/sixserving.txt\n+++ b/ikeepsix.txt\n@@ -1,3 +1,6 @@\n+I Keep Six Honest Serving-Men\n+=============================\n+\n I KEEP six honest serving-men\n (They taught me all I knew);\n Their names are What and Why and When\n@@ -21,4 +24,4 @@ She sends'em abroad on her own affairs,\n One million Hows, two million Wheres,\n And seven million Whys!\n \n- -- Rudyard Kipling\n+ -- Rudyard Kipling\n"; old_tree = resolve_commit_oid_to_tree(g_repo, sha0); new_tree = resolve_commit_oid_to_tree(g_repo, sha1); |