tests/apply/apply_helpers.h

   1 #include "../merge/merge_helpers.h"
   2
   3 #define TEST_REPO_PATH "merge-recursive"
   4
   5 #define DIFF_MODIFY_TWO_FILES \
   6         "diff --git a/asparagus.txt b/asparagus.txt\n" \
   7         "index f516580..ffb36e5 100644\n" \
   8         "--- a/asparagus.txt\n" \
   9         "+++ b/asparagus.txt\n" \
  10         "@@ -1 +1 @@\n" \
  11         "-ASPARAGUS SOUP!\n" \
  12         "+ASPARAGUS SOUP.\n" \
  13         "diff --git a/veal.txt b/veal.txt\n" \
  14         "index 94d2c01..a7b0665 100644\n" \
  15         "--- a/veal.txt\n" \
  16         "+++ b/veal.txt\n" \
  17         "@@ -1 +1 @@\n" \
  18         "-VEAL SOUP!\n" \
  19         "+VEAL SOUP.\n" \
  20         "@@ -7 +7 @@ occasionally, then put into it a shin of veal, let it boil two hours\n" \
  21         "-longer. take out the slices of ham, and skim off the grease if any\n" \
  22         "+longer; take out the slices of ham, and skim off the grease if any\n"
  23
  24 #define DIFF_DELETE_FILE \
  25         "diff --git a/gravy.txt b/gravy.txt\n" \
  26         "deleted file mode 100644\n" \
  27         "index c4e6cca..0000000\n" \
  28         "--- a/gravy.txt\n" \
  29         "+++ /dev/null\n" \
  30         "@@ -1,8 +0,0 @@\n" \
  31         "-GRAVY SOUP.\n" \
  32         "-\n" \
  33         "-Get eight pounds of coarse lean beef--wash it clean and lay it in your\n" \
  34         "-pot, put in the same ingredients as for the shin soup, with the same\n" \
  35         "-quantity of water, and follow the process directed for that. Strain the\n" \
  36         "-soup through a sieve, and serve it up clear, with nothing more than\n" \
  37         "-toasted bread in it; two table-spoonsful of mushroom catsup will add a\n" \
  38         "-fine flavour to the soup.\n"
  39
  40 #define DIFF_ADD_FILE \
  41         "diff --git a/newfile.txt b/newfile.txt\n" \
  42         "new file mode 100644\n" \
  43         "index 0000000..6370543\n" \
  44         "--- /dev/null\n" \
  45         "+++ b/newfile.txt\n" \
  46         "@@ -0,0 +1,2 @@\n" \
  47         "+This is a new file!\n" \
  48         "+Added by a patch.\n"
  49
  50 #define DIFF_EXECUTABLE_FILE \
  51         "diff --git a/beef.txt b/beef.txt\n" \
  52         "old mode 100644\n" \
  53         "new mode 100755\n"
  54
  55 #define DIFF_MANY_CHANGES_ONE \
  56         "diff --git a/veal.txt b/veal.txt\n" \
  57         "index 94d2c01..c9d7d5d 100644\n" \
  58         "--- a/veal.txt\n" \
  59         "+++ b/veal.txt\n" \
  60         "@@ -1,2 +1,2 @@\n" \
  61         "-VEAL SOUP!\n" \
  62         "+VEAL SOUP\n" \
  63         " \n" \
  64         "@@ -4,3 +4,2 @@\n" \
  65         " spoonful of black pepper pounded, and two of salt, with two or three\n" \
  66         "-slices of lean ham; let it boil steadily two hours; skim it\n" \
  67         " occasionally, then put into it a shin of veal, let it boil two hours\n" \
  68         "@@ -8,3 +7,3 @@\n" \
  69         " should rise, take a gill of good cream, mix with it two table-spoonsful\n" \
  70         "-of flour very nicely, and the yelks of two eggs beaten well, strain this\n" \
  71         "+OF FLOUR very nicely, and the yelks of two eggs beaten well, strain this\n" \
  72         " mixture, and add some chopped parsley; pour some soup on by degrees,\n" \
  73         "@@ -12,2 +11,3 @@\n" \
  74         " boiled two or three minutes to take off the raw taste of the eggs. If\n" \
  75         "+Inserted line.\n" \
  76         " the cream be not perfectly sweet, and the eggs quite new, the thickening\n" \
  77         "@@ -15,3 +15,3 @@\n" \
  78         " in, first taking off their skins, by letting them stand a few minutes in\n" \
  79         "-hot water, when they may be easily peeled. When made in this way you\n" \
  80         "+Changed line.\n" \
  81         " must thicken it with the flour only. Any part of the veal may be used,\n"
  82
  83 #define DIFF_MANY_CHANGES_TWO \
  84         "diff --git a/veal.txt b/veal.txt\n" \
  85         "index 94d2c01..6b943d6 100644\n" \
  86         "--- a/veal.txt\n" \
  87         "+++ b/veal.txt\n" \
  88         "@@ -1,2 +1,2 @@\n" \
  89         "-VEAL SOUP!\n" \
  90         "+VEAL SOUP!!!\n" \
  91         " \n" \
  92         "@@ -4,3 +4,2 @@\n" \
  93         " spoonful of black pepper pounded, and two of salt, with two or three\n" \
  94         "-slices of lean ham; let it boil steadily two hours; skim it\n" \
  95         " occasionally, then put into it a shin of veal, let it boil two hours\n" \
  96         "@@ -8,3 +7,3 @@\n" \
  97         " should rise, take a gill of good cream, mix with it two table-spoonsful\n" \
  98         "-of flour very nicely, and the yelks of two eggs beaten well, strain this\n" \
  99         "+of flour very nicely, AND the yelks of two eggs beaten well, strain this\n" \
 100         " mixture, and add some chopped parsley; pour some soup on by degrees,\n" \
 101         "@@ -12,2 +11,3 @@\n" \
 102         " boiled two or three minutes to take off the raw taste of the eggs. If\n" \
 103         "+New line.\n" \
 104         " the cream be not perfectly sweet, and the eggs quite new, the thickening\n" \
 105         "@@ -15,4 +15,5 @@\n" \
 106         " in, first taking off their skins, by letting them stand a few minutes in\n" \
 107         "-hot water, when they may be easily peeled. When made in this way you\n" \
 108         "-must thicken it with the flour only. Any part of the veal may be used,\n" \
 109         "-but the shin or knuckle is the nicest.\n" \
 110         "+HOT water, when they may be easily peeled. When made in this way you\n" \
 111         "+must THICKEN it with the flour only. Any part of the veal may be used,\n" \
 112         "+but the shin OR knuckle is the nicest.\n" \
 113         "+Another new line.\n" \
 114
 115 #define DIFF_RENAME_FILE \
 116         "diff --git a/beef.txt b/notbeef.txt\n" \
 117         "similarity index 100%\n" \
 118         "rename from beef.txt\n" \
 119         "rename to notbeef.txt\n"
 120
 121 #define DIFF_RENAME_AND_MODIFY_FILE \
 122         "diff --git a/beef.txt b/notbeef.txt\n" \
 123         "similarity index 97%\n" \
 124         "rename from beef.txt\n" \
 125         "rename to notbeef.txt\n" \
 126         "index 68f6182..6fa1014 100644\n" \
 127         "--- a/beef.txt\n" \
 128         "+++ b/notbeef.txt\n" \
 129         "@@ -1,4 +1,4 @@\n" \
 130         "-BEEF SOUP.\n" \
 131         "+THIS IS NOT BEEF SOUP, IT HAS A NEW NAME.\n" \
 132         "\n" \
 133         " Take the hind shin of beef, cut off all the flesh off the leg-bone,\n" \
 134         " which must be taken away entirely, or the soup will be greasy. Wash the\n"
 135
 136 #define DIFF_RENAME_A_TO_B_TO_C \
 137         "diff --git a/asparagus.txt b/asparagus.txt\n" \
 138         "deleted file mode 100644\n" \
 139         "index f516580..0000000\n" \
 140         "--- a/asparagus.txt\n" \
 141         "+++ /dev/null\n" \
 142         "@@ -1,10 +0,0 @@\n" \
 143         "-ASPARAGUS SOUP!\n" \
 144         "-\n" \
 145         "-Take four large bunches of asparagus, scrape it nicely, cut off one inch\n" \
 146         "-of the tops, and lay them in water, chop the stalks and put them on the\n" \
 147         "-fire with a piece of bacon, a large onion cut up, and pepper and salt;\n" \
 148         "-add two quarts of water, boil them till the stalks are quite soft, then\n" \
 149         "-pulp them through a sieve, and strain the water to it, which must be put\n" \
 150         "-back in the pot; put into it a chicken cut up, with the tops of\n" \
 151         "-asparagus which had been laid by, boil it until these last articles are\n" \
 152         "-sufficiently done, thicken with flour, butter and milk, and serve it up.\n" \
 153         "diff --git a/beef.txt b/beef.txt\n" \
 154         "index 68f6182..f516580 100644\n" \
 155         "--- a/beef.txt\n" \
 156         "+++ b/beef.txt\n" \
 157         "@@ -1,22 +1,10 @@\n" \
 158         "-BEEF SOUP.\n" \
 159         "+ASPARAGUS SOUP!\n" \
 160         "\n" \
 161         "-Take the hind shin of beef, cut off all the flesh off the leg-bone,\n" \
 162         "-which must be taken away entirely, or the soup will be greasy. Wash the\n" \
 163         "-meat clean and lay it in a pot, sprinkle over it one small\n" \
 164         "-table-spoonful of pounded black pepper, and two of salt; three onions\n" \
 165         "-the size of a hen's egg, cut small, six small carrots scraped and cut\n" \
 166         "-up, two small turnips pared and cut into dice; pour on three quarts of\n" \
 167         "-water, cover the pot close, and keep it gently and steadily boiling five\n" \
 168         "-hours, which will leave about three pints of clear soup; do not let the\n" \
 169         "-pot boil over, but take off the scum carefully, as it rises. When it has\n" \
 170         "-boiled four hours, put in a small bundle of thyme and parsley, and a\n" \
 171         "-pint of celery cut small, or a tea-spoonful of celery seed pounded.\n" \
 172         "-These latter ingredients would lose their delicate flavour if boiled too\n" \
 173         "-much. Just before you take it up, brown it in the following manner: put\n" \
 174         "-a small table-spoonful of nice brown sugar into an iron skillet, set it\n" \
 175         "-on the fire and stir it till it melts and looks very dark, pour into it\n" \
 176         "-a ladle full of the soup, a little at a time; stirring it all the while.\n" \
 177         "-Strain this browning and mix it well with the soup; take out the bundle\n" \
 178         "-of thyme and parsley, put the nicest pieces of meat in your tureen, and\n" \
 179         "-pour on the soup and vegetables; put in some toasted bread cut in dice,\n" \
 180         "-and serve it up.\n" \
 181         "+Take four large bunches of asparagus, scrape it nicely, cut off one inch\n" \
 182         "+of the tops, and lay them in water, chop the stalks and put them on the\n" \
 183         "+fire with a piece of bacon, a large onion cut up, and pepper and salt;\n" \
 184         "+add two quarts of water, boil them till the stalks are quite soft, then\n" \
 185         "+pulp them through a sieve, and strain the water to it, which must be put\n" \
 186         "+back in the pot; put into it a chicken cut up, with the tops of\n" \
 187         "+asparagus which had been laid by, boil it until these last articles are\n" \
 188         "+sufficiently done, thicken with flour, butter and milk, and serve it up.\n" \
 189         "diff --git a/notbeef.txt b/notbeef.txt\n" \
 190         "new file mode 100644\n" \
 191         "index 0000000..68f6182\n" \
 192         "--- /dev/null\n" \
 193         "+++ b/notbeef.txt\n" \
 194         "@@ -0,0 +1,22 @@\n" \
 195         "+BEEF SOUP.\n" \
 196         "+\n" \
 197         "+Take the hind shin of beef, cut off all the flesh off the leg-bone,\n" \
 198         "+which must be taken away entirely, or the soup will be greasy. Wash the\n" \
 199         "+meat clean and lay it in a pot, sprinkle over it one small\n" \
 200         "+table-spoonful of pounded black pepper, and two of salt; three onions\n" \
 201         "+the size of a hen's egg, cut small, six small carrots scraped and cut\n" \
 202         "+up, two small turnips pared and cut into dice; pour on three quarts of\n" \
 203         "+water, cover the pot close, and keep it gently and steadily boiling five\n" \
 204         "+hours, which will leave about three pints of clear soup; do not let the\n" \
 205         "+pot boil over, but take off the scum carefully, as it rises. When it has\n" \
 206         "+boiled four hours, put in a small bundle of thyme and parsley, and a\n" \
 207         "+pint of celery cut small, or a tea-spoonful of celery seed pounded.\n" \
 208         "+These latter ingredients would lose their delicate flavour if boiled too\n" \
 209         "+much. Just before you take it up, brown it in the following manner: put\n" \
 210         "+a small table-spoonful of nice brown sugar into an iron skillet, set it\n" \
 211         "+on the fire and stir it till it melts and looks very dark, pour into it\n" \
 212         "+a ladle full of the soup, a little at a time; stirring it all the while.\n" \
 213         "+Strain this browning and mix it well with the soup; take out the bundle\n" \
 214         "+of thyme and parsley, put the nicest pieces of meat in your tureen, and\n" \
 215         "+pour on the soup and vegetables; put in some toasted bread cut in dice,\n" \
 216         "+and serve it up.\n"
 217
 218 #define DIFF_RENAME_A_TO_B_TO_C_EXACT \
 219         "diff --git a/asparagus.txt b/beef.txt\n" \
 220         "similarity index 100%\n" \
 221         "rename from asparagus.txt\n" \
 222         "rename to beef.txt\n" \
 223         "diff --git a/beef.txt b/notbeef.txt\n" \
 224         "similarity index 100%\n" \
 225         "rename from beef.txt\n" \
 226         "rename to notbeef.txt\n"
 227
 228 #define DIFF_RENAME_CIRCULAR \
 229         "diff --git a/asparagus.txt b/beef.txt\n" \
 230         "similarity index 100%\n" \
 231         "rename from asparagus.txt\n" \
 232         "rename to beef.txt\n" \
 233         "diff --git a/beef.txt b/notbeef.txt\n" \
 234         "similarity index 100%\n" \
 235         "rename from beef.txt\n" \
 236         "rename to asparagus.txt\n"
 237
 238 #define DIFF_RENAME_2_TO_1 \
 239         "diff --git a/asparagus.txt b/2.txt\n" \
 240         "similarity index 100%\n" \
 241         "rename from asparagus.txt\n" \
 242         "rename to 2.txt\n" \
 243         "diff --git a/beef.txt b/2.txt\n" \
 244         "similarity index 100%\n" \
 245         "rename from beef.txt\n" \
 246         "rename to 2.txt\n"
 247
 248 #define DIFF_RENAME_1_TO_2 \
 249         "diff --git a/asparagus.txt b/2.txt\n" \
 250         "similarity index 100%\n" \
 251         "rename from asparagus.txt\n" \
 252         "rename to 1.txt\n" \
 253         "diff --git a/asparagus.txt b/2.txt\n" \
 254         "similarity index 100%\n" \
 255         "rename from asparagus.txt\n" \
 256         "rename to 2.txt\n"
 257
 258 #define DIFF_TWO_DELTAS_ONE_FILE \
 259         "diff --git a/beef.txt b/beef.txt\n" \
 260         "index 68f6182..235069d 100644\n" \
 261         "--- a/beef.txt\n" \
 262         "+++ b/beef.txt\n" \
 263         "@@ -1,4 +1,4 @@\n" \
 264         "-BEEF SOUP.\n" \
 265         "+BEEF SOUP!\n" \
 266         "\n" \
 267         " Take the hind shin of beef, cut off all the flesh off the leg-bone,\n" \
 268         " which must be taken away entirely, or the soup will be greasy. Wash the\n" \
 269         "diff --git a/beef.txt b/beef.txt\n" \
 270         "index 68f6182..e059eb5 100644\n" \
 271         "--- a/beef.txt\n" \
 272         "+++ b/beef.txt\n" \
 273         "@@ -19,4 +19,4 @@ a ladle full of the soup, a little at a time; stirring it all the while.\n" \
 274         " Strain this browning and mix it well with the soup; take out the bundle\n" \
 275         " of thyme and parsley, put the nicest pieces of meat in your tureen, and\n" \
 276         " pour on the soup and vegetables; put in some toasted bread cut in dice,\n" \
 277         "-and serve it up.\n" \
 278         "+and serve it up!\n"
 279
 280 #define DIFF_TWO_DELTAS_ONE_NEW_FILE \
 281         "diff --git a/newfile.txt b/newfile.txt\n" \
 282         "new file mode 100644\n" \
 283         "index 0000000..6434b13\n" \
 284         "--- /dev/null\n" \
 285         "+++ b/newfile.txt\n" \
 286         "@@ -0,0 +1 @@\n" \
 287         "+This is a new file.\n" \
 288         "diff --git a/newfile.txt b/newfile.txt\n" \
 289         "index 6434b13..08d4c44 100644\n" \
 290         "--- a/newfile.txt\n" \
 291         "+++ b/newfile.txt\n" \
 292         "@@ -1 +1,3 @@\n" \
 293         " This is a new file.\n" \
 294         "+\n" \
 295         "+This is another change to a new file.\n"
 296
 297 #define DIFF_RENAME_AND_MODIFY_DELTAS \
 298         "diff --git a/veal.txt b/asdf.txt\n" \
 299         "similarity index 96%\n" \
 300         "rename from veal.txt\n" \
 301         "rename to asdf.txt\n" \
 302         "index 94d2c01..292cb60 100644\n" \
 303         "--- a/veal.txt\n" \
 304         "+++ b/asdf.txt\n" \
 305         "@@ -15,4 +15,4 @@ will curdle in the soup. For a change you may put a dozen ripe tomatos\n" \
 306         " in, first taking off their skins, by letting them stand a few minutes in\n" \
 307         " hot water, when they may be easily peeled. When made in this way you\n" \
 308         " must thicken it with the flour only. Any part of the veal may be used,\n" \
 309         "-but the shin or knuckle is the nicest.\n" \
 310         "+but the shin or knuckle is the nicest!\n" \
 311         "diff --git a/asdf.txt b/asdf.txt\n" \
 312         "index 292cb60..61c686b 100644\n" \
 313         "--- a/asdf.txt\n" \
 314         "+++ b/asdf.txt\n" \
 315         "@@ -1,4 +1,4 @@\n" \
 316         "-VEAL SOUP!\n" \
 317         "+VEAL SOUP\n" \
 318         "\n" \
 319         " Put into a pot three quarts of water, three onions cut small, one\n" \
 320         " spoonful of black pepper pounded, and two of salt, with two or three\n"
 321
 322 #define DIFF_RENAME_AFTER_MODIFY \
 323         "diff --git a/veal.txt b/veal.txt\n" \
 324         "index 292cb60..61c686b 100644\n" \
 325         "--- a/veal.txt\n" \
 326         "+++ b/veal.txt\n" \
 327         "@@ -1,4 +1,4 @@\n" \
 328         "-VEAL SOUP!\n" \
 329         "+VEAL SOUP\n" \
 330         "\n" \
 331         " Put into a pot three quarts of water, three onions cut small, one\n" \
 332         " spoonful of black pepper pounded, and two of salt, with two or three\n" \
 333         "diff --git a/veal.txt b/other.txt\n" \
 334         "similarity index 96%\n" \
 335         "rename from veal.txt\n" \
 336         "rename to other.txt\n" \
 337         "index 94d2c01..292cb60 100644\n" \
 338         "--- a/veal.txt\n" \
 339         "+++ b/other.txt\n" \
 340         "@@ -15,4 +15,4 @@ will curdle in the soup. For a change you may put a dozen ripe tomatos\n" \
 341         " in, first taking off their skins, by letting them stand a few minutes in\n" \
 342         " hot water, when they may be easily peeled. When made in this way you\n" \
 343         " must thicken it with the flour only. Any part of the veal may be used,\n" \
 344         "-but the shin or knuckle is the nicest.\n" \
 345         "+but the shin or knuckle is the nicest!\n"
 346
 347 #define DIFF_RENAME_AFTER_MODIFY_TARGET_PATH \
 348         "diff --git a/beef.txt b/beef.txt\n" \
 349         "index 292cb60..61c686b 100644\n" \
 350         "--- a/beef.txt\n" \
 351         "+++ b/beef.txt\n" \
 352         "@@ -1,4 +1,4 @@\n" \
 353         "-VEAL SOUP!\n" \
 354         "+VEAL SOUP\n" \
 355         "\n" \
 356         " Put into a pot three quarts of water, three onions cut small, one\n" \
 357         " spoonful of black pepper pounded, and two of salt, with two or three\n" \
 358         "diff --git a/veal.txt b/beef.txt\n" \
 359         "similarity index 96%\n" \
 360         "rename from veal.txt\n" \
 361         "rename to beef.txt\n" \
 362         "index 94d2c01..292cb60 100644\n" \
 363         "--- a/veal.txt\n" \
 364         "+++ b/beef.txt\n" \
 365         "@@ -15,4 +15,4 @@ will curdle in the soup. For a change you may put a dozen ripe tomatos\n" \
 366         " in, first taking off their skins, by letting them stand a few minutes in\n" \
 367         " hot water, when they may be easily peeled. When made in this way you\n" \
 368         " must thicken it with the flour only. Any part of the veal may be used,\n" \
 369         "-but the shin or knuckle is the nicest.\n" \
 370         "+but the shin or knuckle is the nicest!\n"
 371
 372 #define DIFF_RENAME_AND_MODIFY_SOURCE_PATH \
 373         "diff --git a/veal.txt b/asdf.txt\n" \
 374         "similarity index 96%\n" \
 375         "rename from veal.txt\n" \
 376         "rename to asdf.txt\n" \
 377         "index 94d2c01..292cb60 100644\n" \
 378         "--- a/veal.txt\n" \
 379         "+++ b/asdf.txt\n" \
 380         "@@ -15,4 +15,4 @@ will curdle in the soup. For a change you may put a dozen ripe tomatos\n" \
 381         " in, first taking off their skins, by letting them stand a few minutes in\n" \
 382         " hot water, when they may be easily peeled. When made in this way you\n" \
 383         " must thicken it with the flour only. Any part of the veal may be used,\n" \
 384         "-but the shin or knuckle is the nicest.\n" \
 385         "+but the shin or knuckle is the nicest!\n" \
 386         "diff --git a/veal.txt b/veal.txt\n" \
 387         "index 292cb60..61c686b 100644\n" \
 388         "--- a/veal.txt\n" \
 389         "+++ b/veal.txt\n" \
 390         "@@ -1,4 +1,4 @@\n" \
 391         "-VEAL SOUP!\n" \
 392         "+VEAL SOUP\n" \
 393         "\n" \
 394         " Put into a pot three quarts of water, three onions cut small, one\n" \
 395         " spoonful of black pepper pounded, and two of salt, with two or three\n"
 396
 397 #define DIFF_DELETE_AND_READD_FILE \
 398         "diff --git a/asparagus.txt b/asparagus.txt\n" \
 399         "deleted file mode 100644\n" \
 400         "index f516580..0000000\n" \
 401         "--- a/asparagus.txt\n" \
 402         "+++ /dev/null\n" \
 403         "@@ -1,10 +0,0 @@\n" \
 404         "-ASPARAGUS SOUP!\n" \
 405         "-\n" \
 406         "-Take four large bunches of asparagus, scrape it nicely, cut off one inch\n" \
 407         "-of the tops, and lay them in water, chop the stalks and put them on the\n" \
 408         "-fire with a piece of bacon, a large onion cut up, and pepper and salt;\n" \
 409         "-add two quarts of water, boil them till the stalks are quite soft, then\n" \
 410         "-pulp them through a sieve, and strain the water to it, which must be put\n" \
 411         "-back in the pot; put into it a chicken cut up, with the tops of\n" \
 412         "-asparagus which had been laid by, boil it until these last articles are\n" \
 413         "-sufficiently done, thicken with flour, butter and milk, and serve it up.\n" \
 414         "diff --git a/asparagus.txt b/asparagus.txt\n" \
 415         "new file mode 100644\n" \
 416         "index 0000000..2dc7f8b\n" \
 417         "--- /dev/null\n" \
 418         "+++ b/asparagus.txt\n" \
 419         "@@ -0,0 +1 @@\n" \
 420         "+New file.\n" \
 421
 422 #define DIFF_REMOVE_FILE_TWICE \
 423         "diff --git a/asparagus.txt b/asparagus.txt\n" \
 424         "deleted file mode 100644\n" \
 425         "index f516580..0000000\n" \
 426         "--- a/asparagus.txt\n" \
 427         "+++ /dev/null\n" \
 428         "@@ -1,10 +0,0 @@\n" \
 429         "-ASPARAGUS SOUP!\n" \
 430         "-\n" \
 431         "-Take four large bunches of asparagus, scrape it nicely, cut off one inch\n" \
 432         "-of the tops, and lay them in water, chop the stalks and put them on the\n" \
 433         "-fire with a piece of bacon, a large onion cut up, and pepper and salt;\n" \
 434         "-add two quarts of water, boil them till the stalks are quite soft, then\n" \
 435         "-pulp them through a sieve, and strain the water to it, which must be put\n" \
 436         "-back in the pot; put into it a chicken cut up, with the tops of\n" \
 437         "-asparagus which had been laid by, boil it until these last articles are\n" \
 438         "-sufficiently done, thicken with flour, butter and milk, and serve it up.\n" \
 439         "diff --git a/asparagus.txt b/asparagus.txt\n" \
 440         "deleted file mode 100644\n" \
 441         "index f516580..0000000\n" \
 442         "--- a/asparagus.txt\n" \
 443         "+++ /dev/null\n" \
 444         "@@ -1,10 +0,0 @@\n" \
 445         "-ASPARAGUS SOUP!\n" \
 446         "-\n" \
 447         "-Take four large bunches of asparagus, scrape it nicely, cut off one inch\n" \
 448         "-of the tops, and lay them in water, chop the stalks and put them on the\n" \
 449         "-fire with a piece of bacon, a large onion cut up, and pepper and salt;\n" \
 450         "-add two quarts of water, boil them till the stalks are quite soft, then\n" \
 451         "-pulp them through a sieve, and strain the water to it, which must be put\n" \
 452         "-back in the pot; put into it a chicken cut up, with the tops of\n" \
 453         "-asparagus which had been laid by, boil it until these last articles are\n" \
 454         "-sufficiently done, thicken with flour, butter and milk, and serve it up.\n"
 455
 456 void validate_apply_workdir(
 457         git_repository *repo,
 458         struct merge_index_entry *workdir_entries,
 459         size_t workdir_cnt);
 460
 461 void validate_apply_index(
 462         git_repository *repo,
 463         struct merge_index_entry *index_entries,
 464         size_t index_cnt);
 465
 466 void validate_index_unchanged(git_repository *repo);
 467 void validate_workdir_unchanged(git_repository *repo);