Commit 1d04f477e5c3c83b6c3985df21fa5fbec600f302
2019-03-19T23:43:56
merge: tests for bare repo merge analysis dupe of workdir/analysis.c against a bare repo.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 1541 1542 1543 1544 1545 1546 1547 1548 1549 1550 1551 1552 1553 1554 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 1568 1569 1570 1571 1572 1573 1574 1575 1576 1577 1578 1579 1580 1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 1607 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 1696 1697 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 1713 1714 1715 1716 1717 1718 1719 1720 1721 1722 1723 1724 1725 1726 1727 1728 1729 1730 1731 1732 1733 1734 1735 1736 1737 1738 1739 1740 1741 1742 1743 1744 1745 1746 1747 1748 1749 1750 1751 1752 1753 1754 1755 1756 1757 1758 1759 1760 1761 1762 1763 1764 1765 1766 1767 1768 1769 1770 1771 1772 1773 1774 1775 1776 1777 1778 1779 1780 1781 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 1802 1803 1804 1805 1806 1807 1808 1809 1810 1811 1812 1813 1814 1815 1816 1817 1818 1819 1820 1821 1822 1823 1824 1825 1826 1827 1828 1829 1830 1831 1832 1833 1834 1835 1836 1837 1838 1839 1840 1841 1842 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 1886 1887 1888 1889 1890 1891 1892 1893 1894 1895 1896 1897 1898 1899 1900 1901 1902 1903 1904 1905 1906 1907 1908 1909 1910 1911 1912 1913 1914 1915 1916 1917 1918 1919 1920 1921 1922 1923 1924 1925 1926 1927 1928 1929 1930 1931 1932 1933 1934 1935 1936 1937 1938 1939 1940 1941 1942 1943 1944 1945 1946 1947 1948 1949 1950 1951 1952 1953 1954 1955 1956 1957 1958 1959 1960 1961 1962 1963 1964 1965 1966 1967 1968 1969 1970 1971 1972 1973 1974 1975 1976 1977 1978 1979 1980 1981 1982 1983 1984 1985 1986 1987 1988 1989 1990 1991 1992 1993 1994 1995 1996 1997 1998 1999 2000 2001 2002 2003 2004 2005 2006 2007 2008 2009 2010 2011 2012 2013 2014 2015 2016 2017 2018 2019 2020 2021 2022 2023 2024 2025 2026 2027 2028 2029 2030 2031 2032 2033 2034 2035 2036 2037 2038 2039 2040 2041 2042 2043 2044 2045 2046 2047 2048 2049 2050 2051 2052 2053 2054 2055 2056 2057 2058 2059 2060 2061 2062 2063 2064 2065 2066 2067 2068 2069 2070 2071 2072 2073 2074 2075 2076 2077 2078 2079 2080 2081 2082 2083 2084 2085 2086 2087 2088 2089 2090 2091 2092 2093 2094 2095 2096 2097 2098 2099 2100 2101 2102 2103 2104 2105 2106 2107 2108 2109 2110 2111 2112 2113 2114 2115 2116 2117 2118 2119 2120 2121 2122 2123 2124 2125 2126 2127 2128 2129 2130 2131 2132 2133 2134 2135 2136 2137 2138 2139 2140 2141 2142 2143 2144 2145 2146 2147 2148 2149 2150 2151 2152 2153 2154 2155 2156 2157 2158 2159 2160 2161 2162 2163 2164 2165 2166 2167 2168 2169 2170 2171 2172 2173 2174 2175 2176 2177 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 2199 2200 2201 2202 2203 2204 2205 2206 2207 2208 2209 2210 2211 2212 2213 2214 2215 2216 2217 2218 2219 2220 2221 2222 2223 2224 2225 2226 2227 2228 2229 2230 2231 2232 2233 2234 2235 2236 2237 2238 2239 2240 2241 2242 2243 2244 2245 2246 2247 2248 2249 2250 2251 2252 2253 2254 2255 2256 2257 2258 2259 2260 2261 2262 2263 2264 2265 2266 2267 2268 2269 2270 2271 2272 2273 2274 2275 2276 2277 2278 2279 2280 2281 2282 2283 2284 2285 2286 2287 2288 2289 2290 2291 2292 2293 2294 2295 2296 2297 2298 2299 2300 2301 2302 2303 2304 2305 2306 2307 2308 2309 2310 2311 2312 2313 2314 2315 2316 2317 2318 2319 2320 2321 2322 2323 2324 2325 2326 2327 2328 2329 2330 2331 2332 2333 2334 2335 2336 2337 2338 2339 2340 2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 2355 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 2380 2381 2382 2383 2384 2385 2386 2387 2388 2389 2390 2391 2392 2393 2394 2395 2396 2397 2398 2399 2400 2401 2402 2403 2404 2405 2406 2407 2408 2409 2410 2411 2412 2413 2414 2415 2416 2417 2418 2419 2420 2421 2422 2423 2424 2425 2426 2427 2428 2429 2430 2431 2432 2433 2434 2435 2436 2437 2438 2439 2440 2441 2442 2443 2444 2445 2446 2447 2448 2449 2450 2451 2452 2453 2454 2455 2456 2457 2458 2459 2460 2461 2462 2463 2464 2465 2466 2467 2468 2469 2470 2471 2472 2473 2474 2475 2476 2477 2478 2479 2480 2481 2482 2483 2484 2485 2486 2487 2488 2489 2490 2491 2492 2493 2494 2495 2496 2497 2498 2499 2500 2501 2502 2503 2504 2505 2506 2507 2508 2509 2510 2511 2512 2513 2514 2515 2516 2517 2518 2519 2520 2521 2522 2523 2524 2525 2526 2527 2528 2529 2530 2531 2532 2533 2534 2535 2536 2537 2538 2539 2540 2541 2542 2543 2544 2545 2546 2547 2548 2549 2550 2551 2552 2553 2554 2555 2556 2557 2558 2559 2560 2561 2562 2563 2564 2565 2566 2567 2568 2569 2570 2571 2572 2573 2574 2575 2576 2577 2578 2579 2580 2581 2582 2583 2584 2585 2586 2587 2588 2589 2590 2591 2592 2593 2594 2595 2596 2597 2598 2599 2600 2601 2602 2603 2604 2605 2606 2607 2608 2609 2610 2611 2612 2613 2614 2615 2616 2617 2618 2619 2620 2621 2622 2623 2624 2625 2626 2627 2628 2629 2630 2631 2632 2633 2634 2635 2636 2637 2638 2639 2640 2641 2642 2643 2644 2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 2659 2660 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 2677 2678 2679 2680 2681 2682 2683 2684 2685 2686 2687 2688 2689 2690 2691 2692 2693 2694 2695 2696 2697 2698 2699 2700 2701 2702 2703 2704 2705 2706 2707 2708 2709 2710 2711 2712 2713 2714 2715 2716 2717 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 2734 2735 2736 2737 2738 2739 2740 2741 2742 2743 2744 2745 2746 2747 2748 2749 2750 2751 2752 2753 2754 2755 2756 2757 2758 2759 2760 2761 2762 2763 2764 2765 2766 2767 2768 2769 2770 2771 2772 2773 2774 2775 2776 2777 2778 2779 2780 2781 2782 2783 2784 2785 2786 2787 2788 2789 2790 2791 2792 2793 2794 2795 2796 2797 2798 2799 2800 2801 2802 2803 2804 2805 2806 2807 2808 2809 2810 2811 2812 2813 2814 2815 2816 2817 2818 2819 2820 2821 2822 2823 2824 2825 2826 2827 2828 2829 2830 2831 2832 2833 2834 2835 2836 2837 2838 2839 2840 2841 2842 2843 2844 2845 2846 2847 2848 2849 2850 2851 2852 2853 2854 2855 2856 2857 2858 2859 2860 2861 2862 2863 2864 2865 2866 2867 2868 2869 2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 2901 2902 2903 2904 2905 2906 2907 2908 2909 2910 2911 2912 2913 2914 2915 2916 2917 2918 2919 2920 2921 2922 2923 2924 2925 2926 2927 2928 2929 2930 2931 2932 2933 2934 2935 2936 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072
diff --git a/tests/merge/trees/analysis.c b/tests/merge/trees/analysis.c
new file mode 100644
index 0000000..c57d8c2
--- /dev/null
+++ b/tests/merge/trees/analysis.c
@@ -0,0 +1,170 @@
+#include "clar_libgit2.h"
+#include "git2/repository.h"
+#include "git2/merge.h"
+#include "git2/annotated_commit.h"
+#include "git2/sys/index.h"
+#include "merge.h"
+#include "../merge_helpers.h"
+#include "refs.h"
+#include "posix.h"
+
+static git_repository *repo;
+static git_index *repo_index;
+
+#define TEST_REPO_PATH "merge-resolve.git"
+#define TEST_INDEX_PATH TEST_REPO_PATH "/index"
+
+#define UPTODATE_BRANCH "master"
+#define PREVIOUS_BRANCH "previous"
+
+#define FASTFORWARD_BRANCH "ff_branch"
+#define FASTFORWARD_ID "fd89f8cffb663ac89095a0f9764902e93ceaca6a"
+
+#define NOFASTFORWARD_BRANCH "branch"
+#define NOFASTFORWARD_ID "7cb63eed597130ba4abb87b3e544b85021905520"
+
+
+/* Fixture setup and teardown */
+void test_merge_trees_analysis__initialize(void)
+{
+ repo = cl_git_sandbox_init(TEST_REPO_PATH);
+ git_repository_index(&repo_index, repo);
+}
+
+void test_merge_trees_analysis__cleanup(void)
+{
+ git_index_free(repo_index);
+ cl_git_sandbox_cleanup();
+}
+
+static void analysis_from_branch(
+ git_merge_analysis_t *merge_analysis,
+ git_merge_preference_t *merge_pref,
+ const char *our_branchname,
+ const char *their_branchname)
+{
+ git_buf our_refname = GIT_BUF_INIT;
+ git_buf their_refname = GIT_BUF_INIT;
+ git_reference *our_ref;
+ git_reference *their_ref;
+ git_annotated_commit *their_head;
+
+ if (our_branchname != NULL) {
+ cl_git_pass(git_buf_printf(&our_refname, "%s%s", GIT_REFS_HEADS_DIR, our_branchname));
+ cl_git_pass(git_reference_lookup(&our_ref, repo, git_buf_cstr(&our_refname)));
+ } else {
+ cl_git_pass(git_reference_lookup(&our_ref, repo, GIT_HEAD_FILE));
+ }
+
+ cl_git_pass(git_buf_printf(&their_refname, "%s%s", GIT_REFS_HEADS_DIR, their_branchname));
+
+ cl_git_pass(git_reference_lookup(&their_ref, repo, git_buf_cstr(&their_refname)));
+ cl_git_pass(git_annotated_commit_from_ref(&their_head, repo, their_ref));
+
+ cl_git_pass(git_merge_analysis_for_ref(merge_analysis, merge_pref, repo, our_ref, (const git_annotated_commit **)&their_head, 1));
+
+ git_buf_dispose(&our_refname);
+ git_buf_dispose(&their_refname);
+ git_annotated_commit_free(their_head);
+ git_reference_free(our_ref);
+ git_reference_free(their_ref);
+}
+
+void test_merge_trees_analysis__fastforward(void)
+{
+ git_merge_analysis_t merge_analysis;
+ git_merge_preference_t merge_pref;
+
+ analysis_from_branch(&merge_analysis, &merge_pref, NULL, FASTFORWARD_BRANCH);
+ cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL|GIT_MERGE_ANALYSIS_FASTFORWARD, merge_analysis);
+}
+
+void test_merge_trees_analysis__no_fastforward(void)
+{
+ git_merge_analysis_t merge_analysis;
+ git_merge_preference_t merge_pref;
+
+ analysis_from_branch(&merge_analysis, &merge_pref, NULL, NOFASTFORWARD_BRANCH);
+ cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis);
+}
+
+void test_merge_trees_analysis__uptodate(void)
+{
+ git_merge_analysis_t merge_analysis;
+ git_merge_preference_t merge_pref;
+
+ analysis_from_branch(&merge_analysis, &merge_pref, NULL, UPTODATE_BRANCH);
+ cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis);
+}
+
+void test_merge_trees_analysis__uptodate_merging_prev_commit(void)
+{
+ git_merge_analysis_t merge_analysis;
+ git_merge_preference_t merge_pref;
+
+ analysis_from_branch(&merge_analysis, &merge_pref, NULL, PREVIOUS_BRANCH);
+ cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis);
+}
+
+void test_merge_trees_analysis__unborn(void)
+{
+ git_merge_analysis_t merge_analysis;
+ git_merge_preference_t merge_pref;
+ git_buf master = GIT_BUF_INIT;
+
+ git_buf_joinpath(&master, git_repository_path(repo), "refs/heads/master");
+ p_unlink(git_buf_cstr(&master));
+
+ analysis_from_branch(&merge_analysis, &merge_pref, NULL, NOFASTFORWARD_BRANCH);
+ cl_assert_equal_i(GIT_MERGE_ANALYSIS_FASTFORWARD|GIT_MERGE_ANALYSIS_UNBORN, merge_analysis);
+
+ git_buf_dispose(&master);
+}
+
+void test_merge_trees_analysis__fastforward_with_config_noff(void)
+{
+ git_config *config;
+ git_merge_analysis_t merge_analysis;
+ git_merge_preference_t merge_pref;
+
+ git_repository_config(&config, repo);
+ git_config_set_string(config, "merge.ff", "false");
+
+ analysis_from_branch(&merge_analysis, &merge_pref, NULL, FASTFORWARD_BRANCH);
+ cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL|GIT_MERGE_ANALYSIS_FASTFORWARD, merge_analysis);
+
+ cl_assert_equal_i(GIT_MERGE_PREFERENCE_NO_FASTFORWARD, (merge_pref & GIT_MERGE_PREFERENCE_NO_FASTFORWARD));
+}
+
+void test_merge_trees_analysis__no_fastforward_with_config_ffonly(void)
+{
+ git_config *config;
+ git_merge_analysis_t merge_analysis;
+ git_merge_preference_t merge_pref;
+
+ git_repository_config(&config, repo);
+ git_config_set_string(config, "merge.ff", "only");
+
+ analysis_from_branch(&merge_analysis, &merge_pref, NULL, NOFASTFORWARD_BRANCH);
+ cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis);
+
+ cl_assert_equal_i(GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY, (merge_pref & GIT_MERGE_PREFERENCE_FASTFORWARD_ONLY));
+}
+
+void test_merge_trees_analysis__between_uptodate_refs(void)
+{
+ git_merge_analysis_t merge_analysis;
+ git_merge_preference_t merge_pref;
+
+ analysis_from_branch(&merge_analysis, &merge_pref, NOFASTFORWARD_BRANCH, PREVIOUS_BRANCH);
+ cl_assert_equal_i(GIT_MERGE_ANALYSIS_UP_TO_DATE, merge_analysis);
+}
+
+void test_merge_trees_analysis__between_noff_refs(void)
+{
+ git_merge_analysis_t merge_analysis;
+ git_merge_preference_t merge_pref;
+
+ analysis_from_branch(&merge_analysis, &merge_pref, "branch", FASTFORWARD_BRANCH);
+ cl_assert_equal_i(GIT_MERGE_ANALYSIS_NORMAL, merge_analysis);
+}
diff --git a/tests/resources/merge-resolve.git/COMMIT_EDITMSG b/tests/resources/merge-resolve.git/COMMIT_EDITMSG
new file mode 100644
index 0000000..245b18a
--- /dev/null
+++ b/tests/resources/merge-resolve.git/COMMIT_EDITMSG
@@ -0,0 +1 @@
+rename conflict theirs
diff --git a/tests/resources/merge-resolve.git/HEAD b/tests/resources/merge-resolve.git/HEAD
new file mode 100644
index 0000000..cb089cd
--- /dev/null
+++ b/tests/resources/merge-resolve.git/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master
diff --git a/tests/resources/merge-resolve.git/ORIG_HEAD b/tests/resources/merge-resolve.git/ORIG_HEAD
new file mode 100644
index 0000000..4092d42
--- /dev/null
+++ b/tests/resources/merge-resolve.git/ORIG_HEAD
@@ -0,0 +1 @@
+2392a2dacc9efb562b8635d6579fb458751c7c5b
diff --git a/tests/resources/merge-resolve.git/config b/tests/resources/merge-resolve.git/config
new file mode 100644
index 0000000..b90c8ba
--- /dev/null
+++ b/tests/resources/merge-resolve.git/config
@@ -0,0 +1,8 @@
+[core]
+ repositoryformatversion = 0
+ filemode = true
+ bare = true
+ logallrefupdates = true
+ ignorecase = true
+[submodule "submodule"]
+ url = ../submodule
diff --git a/tests/resources/merge-resolve.git/description b/tests/resources/merge-resolve.git/description
new file mode 100644
index 0000000..498b267
--- /dev/null
+++ b/tests/resources/merge-resolve.git/description
@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.
diff --git a/tests/resources/merge-resolve.git/index b/tests/resources/merge-resolve.git/index
new file mode 100644
index 0000000..230eba9
Binary files /dev/null and b/tests/resources/merge-resolve.git/index differ
diff --git a/tests/resources/merge-resolve.git/logs/HEAD b/tests/resources/merge-resolve.git/logs/HEAD
new file mode 100644
index 0000000..96cdb33
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/HEAD
@@ -0,0 +1,236 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1351563869 -0500 commit (initial): initial
+c607fc30883e335def28cd686b51f6cfa02b06ec c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1351563886 -0500 checkout: moving from master to branch
+c607fc30883e335def28cd686b51f6cfa02b06ec 7cb63eed597130ba4abb87b3e544b85021905520 Edward Thomson <ethomson@edwardthomson.com> 1351563965 -0500 commit: branch
+7cb63eed597130ba4abb87b3e544b85021905520 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1351563968 -0500 checkout: moving from branch to master
+c607fc30883e335def28cd686b51f6cfa02b06ec 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351564033 -0500 commit: master
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351605785 -0500 checkout: moving from master to ff_branch
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 33d500f588fbbe65901d82b4e6b008e549064be0 Edward Thomson <ethomson@edwardthomson.com> 1351605830 -0500 commit: fastforward
+33d500f588fbbe65901d82b4e6b008e549064be0 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351605889 -0500 checkout: moving from ff_branch to master
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351874933 -0500 checkout: moving from master to octo1
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 16f825815cfd20a07a75c71554e82d8eede0b061 Edward Thomson <ethomson@edwardthomson.com> 1351874954 -0500 commit: octo1
+16f825815cfd20a07a75c71554e82d8eede0b061 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351874957 -0500 checkout: moving from octo1 to master
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351874960 -0500 checkout: moving from master to octo2
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 158dc7bedb202f5b26502bf3574faa7f4238d56c Edward Thomson <ethomson@edwardthomson.com> 1351874974 -0500 commit: octo2
+158dc7bedb202f5b26502bf3574faa7f4238d56c 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351874976 -0500 checkout: moving from octo2 to master
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351874980 -0500 checkout: moving from master to octo3
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 50ce7d7d01217679e26c55939eef119e0c93e272 Edward Thomson <ethomson@edwardthomson.com> 1351874998 -0500 commit: octo3
+50ce7d7d01217679e26c55939eef119e0c93e272 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351875006 -0500 checkout: moving from octo3 to master
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351875010 -0500 checkout: moving from master to octo4
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 54269b3f6ec3d7d4ede24dd350dd5d605495c3ae Edward Thomson <ethomson@edwardthomson.com> 1351875023 -0500 commit: octo4
+54269b3f6ec3d7d4ede24dd350dd5d605495c3ae 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351875031 -0500 checkout: moving from octo4 to master
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351875031 -0500 checkout: moving from master to octo5
+977c696519c5a3004c5f1d15d60c89dbeb8f235f e4f618a2c3ed0669308735727df5ebf2447f022f Edward Thomson <ethomson@edwardthomson.com> 1351875041 -0500 commit: octo5
+e4f618a2c3ed0669308735727df5ebf2447f022f 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351875046 -0500 checkout: moving from octo5 to master
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351875046 -0500 checkout: moving from master to octo6
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 4ca408a8c88655f7586a1b580be6fad138121e98 Edward Thomson <ethomson@edwardthomson.com> 1351875057 -0500 commit: octo5
+4ca408a8c88655f7586a1b580be6fad138121e98 b6f610aef53bd343e6c96227de874c66f00ee8e8 Edward Thomson <ethomson@edwardthomson.com> 1351875065 -0500 commit (amend): octo6
+b6f610aef53bd343e6c96227de874c66f00ee8e8 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351875071 -0500 checkout: moving from octo6 to master
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 4e0d9401aee78eb345a8685a859d37c8c3c0bbed Edward Thomson <ethomson@edwardthomson.com> 1351875091 -0500 merge octo1 octo2 octo3 octo4: Merge made by the 'octopus' strategy.
+4e0d9401aee78eb345a8685a859d37c8c3c0bbed 54269b3f6ec3d7d4ede24dd350dd5d605495c3ae Edward Thomson <ethomson@edwardthomson.com> 1351875108 -0500 reset: moving to 54269b3f6ec3d7d4ede24dd350dd5d605495c3ae
+54269b3f6ec3d7d4ede24dd350dd5d605495c3ae 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351875584 -0500 reset: moving to 977c696519c5a3004c5f1d15d60c89dbeb8f235f
+bd593285fc7fe4ca18ccdbabf027f5d689101452 33d500f588fbbe65901d82b4e6b008e549064be0 Edward Thomson <ethomson@edwardthomson.com> 1351990193 -0500 checkout: moving from master to ff_branch
+33d500f588fbbe65901d82b4e6b008e549064be0 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1351990202 -0500 reset: moving to c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1351990205 -0500 merge master: Fast-forward
+bd593285fc7fe4ca18ccdbabf027f5d689101452 fd89f8cffb663ac89095a0f9764902e93ceaca6a Edward Thomson <ethomson@edwardthomson.com> 1351990229 -0500 commit: fastforward
+fd89f8cffb663ac89095a0f9764902e93ceaca6a bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1351990233 -0500 checkout: moving from ff_branch to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352091703 -0600 checkout: moving from master to trivial-2alt
+c607fc30883e335def28cd686b51f6cfa02b06ec c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352092411 -0600 checkout: moving from trivial-2alt to trivial-2alt-branch
+c607fc30883e335def28cd686b51f6cfa02b06ec c9174cef549ec94ecbc43ef03cdc775b4950becb Edward Thomson <ethomson@edwardthomson.com> 1352092434 -0600 commit: 2alt-branch
+c9174cef549ec94ecbc43ef03cdc775b4950becb c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352092440 -0600 checkout: moving from trivial-2alt-branch to trivial-2alt
+c607fc30883e335def28cd686b51f6cfa02b06ec 566ab53c220a2eafc1212af1a024513230280ab9 Edward Thomson <ethomson@edwardthomson.com> 1352092452 -0600 commit: 2alt
+bd593285fc7fe4ca18ccdbabf027f5d689101452 566ab53c220a2eafc1212af1a024513230280ab9 Edward Thomson <ethomson@edwardthomson.com> 1352094476 -0600 checkout: moving from master to trivial-3alt
+566ab53c220a2eafc1212af1a024513230280ab9 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352094547 -0600 reset: moving to c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec 5459c89aa0026d543ce8343bd89871bce543f9c2 Edward Thomson <ethomson@edwardthomson.com> 1352094580 -0600 commit: 3alt
+5459c89aa0026d543ce8343bd89871bce543f9c2 4c9fac0707f8d4195037ae5a681aa48626491541 Edward Thomson <ethomson@edwardthomson.com> 1352094610 -0600 commit: 3alt-branch
+4c9fac0707f8d4195037ae5a681aa48626491541 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1352094620 -0600 checkout: moving from trivial-3alt to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 566ab53c220a2eafc1212af1a024513230280ab9 Edward Thomson <ethomson@edwardthomson.com> 1352094752 -0600 checkout: moving from master to trivial-4
+566ab53c220a2eafc1212af1a024513230280ab9 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352094764 -0600 reset: moving to c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec cc3e3009134cb88014129fc8858d1101359e5e2f Edward Thomson <ethomson@edwardthomson.com> 1352094815 -0600 commit: trivial-4
+cc3e3009134cb88014129fc8858d1101359e5e2f c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352094843 -0600 checkout: moving from trivial-4 to trivial-4-branch
+c607fc30883e335def28cd686b51f6cfa02b06ec 183310e30fb1499af8c619108ffea4d300b5e778 Edward Thomson <ethomson@edwardthomson.com> 1352094856 -0600 commit: trivial-4-branch
+183310e30fb1499af8c619108ffea4d300b5e778 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1352094860 -0600 checkout: moving from trivial-4-branch to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 cc3e3009134cb88014129fc8858d1101359e5e2f Edward Thomson <ethomson@edwardthomson.com> 1352096588 -0600 checkout: moving from master to trivial-4
+cc3e3009134cb88014129fc8858d1101359e5e2f c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352096612 -0600 checkout: moving from trivial-4 to trivial-5alt-1
+c607fc30883e335def28cd686b51f6cfa02b06ec 4fe93c0ec83eb6305cbace3dace88ecee1b63cb6 Edward Thomson <ethomson@edwardthomson.com> 1352096643 -0600 commit: 5alt-1
+4fe93c0ec83eb6305cbace3dace88ecee1b63cb6 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352096661 -0600 checkout: moving from trivial-5alt-1 to trivial-5alt-1-branch
+c607fc30883e335def28cd686b51f6cfa02b06ec 4fe93c0ec83eb6305cbace3dace88ecee1b63cb6 Edward Thomson <ethomson@edwardthomson.com> 1352096671 -0600 checkout: moving from trivial-5alt-1-branch to trivial-5alt-1
+4fe93c0ec83eb6305cbace3dace88ecee1b63cb6 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352096678 -0600 checkout: moving from trivial-5alt-1 to trivial-5alt-1-branch
+c607fc30883e335def28cd686b51f6cfa02b06ec 478172cb2f5ff9b514bc9d04d3bd5ef5840cb3b2 Edward Thomson <ethomson@edwardthomson.com> 1352096689 -0600 commit: 5alt-1-branch
+478172cb2f5ff9b514bc9d04d3bd5ef5840cb3b2 4fe93c0ec83eb6305cbace3dace88ecee1b63cb6 Edward Thomson <ethomson@edwardthomson.com> 1352096701 -0600 checkout: moving from trivial-5alt-1-branch to trivial-5alt-1
+4fe93c0ec83eb6305cbace3dace88ecee1b63cb6 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352096715 -0600 checkout: moving from trivial-5alt-1 to trivial-5alt-2
+c607fc30883e335def28cd686b51f6cfa02b06ec ebc09d0137cfb0c26697aed0109fb943ad906f3f Edward Thomson <ethomson@edwardthomson.com> 1352096764 -0600 commit: existing file
+ebc09d0137cfb0c26697aed0109fb943ad906f3f 3b47b031b3e55ae11e14a05260b1c3ffd6838d55 Edward Thomson <ethomson@edwardthomson.com> 1352096815 -0600 commit: 5alt-2
+3b47b031b3e55ae11e14a05260b1c3ffd6838d55 ebc09d0137cfb0c26697aed0109fb943ad906f3f Edward Thomson <ethomson@edwardthomson.com> 1352096840 -0600 checkout: moving from trivial-5alt-2 to trivial-5alt-2-branch
+ebc09d0137cfb0c26697aed0109fb943ad906f3f f48097eb340dc5a7cae55aabcf1faf4548aa821f Edward Thomson <ethomson@edwardthomson.com> 1352096855 -0600 commit: 5alt-2-branch
+f48097eb340dc5a7cae55aabcf1faf4548aa821f bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1352096858 -0600 checkout: moving from trivial-5alt-2-branch to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352097377 -0600 checkout: moving from master to trivial-6
+c607fc30883e335def28cd686b51f6cfa02b06ec f7c332bd4d4d4b777366cae4d24d1687477576bf Edward Thomson <ethomson@edwardthomson.com> 1352097389 -0600 commit: 6
+f7c332bd4d4d4b777366cae4d24d1687477576bf 99b4f7e4f24470fa06b980bc21f1095c2a9425c0 Edward Thomson <ethomson@edwardthomson.com> 1352097404 -0600 commit: trivial-6
+99b4f7e4f24470fa06b980bc21f1095c2a9425c0 f7c332bd4d4d4b777366cae4d24d1687477576bf Edward Thomson <ethomson@edwardthomson.com> 1352097420 -0600 checkout: moving from trivial-6 to trivial-6-branch
+f7c332bd4d4d4b777366cae4d24d1687477576bf a43150a738849c59376cf30bb2a68348a83c8f48 Edward Thomson <ethomson@edwardthomson.com> 1352097431 -0600 commit: 6-branch
+a43150a738849c59376cf30bb2a68348a83c8f48 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1352097442 -0600 checkout: moving from trivial-6-branch to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 99b4f7e4f24470fa06b980bc21f1095c2a9425c0 Edward Thomson <ethomson@edwardthomson.com> 1352098040 -0600 checkout: moving from master to trivial-6
+99b4f7e4f24470fa06b980bc21f1095c2a9425c0 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1352098057 -0600 checkout: moving from trivial-6 to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 cc3e3009134cb88014129fc8858d1101359e5e2f Edward Thomson <ethomson@edwardthomson.com> 1352098792 -0600 checkout: moving from master to trivial-4
+cc3e3009134cb88014129fc8858d1101359e5e2f c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352098818 -0600 checkout: moving from trivial-4 to trivial-8
+c607fc30883e335def28cd686b51f6cfa02b06ec 75a811bf6bc57694adb3fe604786f3a4efd1cd1b Edward Thomson <ethomson@edwardthomson.com> 1352098884 -0600 commit: trivial-8
+75a811bf6bc57694adb3fe604786f3a4efd1cd1b 75a811bf6bc57694adb3fe604786f3a4efd1cd1b Edward Thomson <ethomson@edwardthomson.com> 1352098947 -0600 checkout: moving from trivial-8 to trivial-8-branch
+75a811bf6bc57694adb3fe604786f3a4efd1cd1b 52d8bc572af2b6d4ee0d5e62ed5d1fbad92210a9 Edward Thomson <ethomson@edwardthomson.com> 1352098979 -0600 commit: trivial-8-branch
+52d8bc572af2b6d4ee0d5e62ed5d1fbad92210a9 75a811bf6bc57694adb3fe604786f3a4efd1cd1b Edward Thomson <ethomson@edwardthomson.com> 1352098982 -0600 checkout: moving from trivial-8-branch to trivial-8
+75a811bf6bc57694adb3fe604786f3a4efd1cd1b 3575826c96a975031d2c14368529cc5c4353a8fd Edward Thomson <ethomson@edwardthomson.com> 1352099000 -0600 commit: trivial-8
+3575826c96a975031d2c14368529cc5c4353a8fd bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1352099008 -0600 checkout: moving from trivial-8 to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352099776 -0600 checkout: moving from master to trivial-7
+c607fc30883e335def28cd686b51f6cfa02b06ec 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson <ethomson@edwardthomson.com> 1352099790 -0600 commit: trivial-7
+092ce8682d7f3a2a3a769a6daca58950168ba5c4 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson <ethomson@edwardthomson.com> 1352099799 -0600 checkout: moving from trivial-7 to trivial-7-branch
+092ce8682d7f3a2a3a769a6daca58950168ba5c4 73cbfdc4fe843169e5b2af8dcad03cbf3acf306c Edward Thomson <ethomson@edwardthomson.com> 1352099812 -0600 commit: trivial-7-branch
+73cbfdc4fe843169e5b2af8dcad03cbf3acf306c 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson <ethomson@edwardthomson.com> 1352099815 -0600 checkout: moving from trivial-7-branch to trivial-7
+092ce8682d7f3a2a3a769a6daca58950168ba5c4 73cbfdc4fe843169e5b2af8dcad03cbf3acf306c Edward Thomson <ethomson@edwardthomson.com> 1352099838 -0600 checkout: moving from trivial-7 to trivial-7-branch
+73cbfdc4fe843169e5b2af8dcad03cbf3acf306c 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson <ethomson@edwardthomson.com> 1352099874 -0600 reset: moving to 092ce8682d7f3a2a3a769a6daca58950168ba5c4
+092ce8682d7f3a2a3a769a6daca58950168ba5c4 009b9cab6fdac02915a88ecd078b7a792ed802d8 Edward Thomson <ethomson@edwardthomson.com> 1352099921 -0600 commit: removed in 7
+009b9cab6fdac02915a88ecd078b7a792ed802d8 5195a1b480f66691b667f10a9e41e70115a78351 Edward Thomson <ethomson@edwardthomson.com> 1352099927 -0600 commit (amend): trivial-7-branch
+5195a1b480f66691b667f10a9e41e70115a78351 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson <ethomson@edwardthomson.com> 1352099937 -0600 checkout: moving from trivial-7-branch to trivial-7
+092ce8682d7f3a2a3a769a6daca58950168ba5c4 d874671ef5b20184836cb983bb273e5280384d0b Edward Thomson <ethomson@edwardthomson.com> 1352099947 -0600 commit: trivial-7
+d874671ef5b20184836cb983bb273e5280384d0b bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1352099949 -0600 checkout: moving from trivial-7 to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352100174 -0600 checkout: moving from master to trivial-10
+c607fc30883e335def28cd686b51f6cfa02b06ec 53825f41ac8d640612f9423a2f03a69f3d96809a Edward Thomson <ethomson@edwardthomson.com> 1352100193 -0600 commit: trivial-10
+53825f41ac8d640612f9423a2f03a69f3d96809a 53825f41ac8d640612f9423a2f03a69f3d96809a Edward Thomson <ethomson@edwardthomson.com> 1352100200 -0600 checkout: moving from trivial-10 to trivial-10-branch
+53825f41ac8d640612f9423a2f03a69f3d96809a 11f4f3c08b737f5fd896cbefa1425ee63b21b2fa Edward Thomson <ethomson@edwardthomson.com> 1352100211 -0600 commit: trivial-10-branch
+11f4f3c08b737f5fd896cbefa1425ee63b21b2fa 53825f41ac8d640612f9423a2f03a69f3d96809a Edward Thomson <ethomson@edwardthomson.com> 1352100214 -0600 checkout: moving from trivial-10-branch to trivial-10
+53825f41ac8d640612f9423a2f03a69f3d96809a 0ec5f433959cd46177f745903353efb5be08d151 Edward Thomson <ethomson@edwardthomson.com> 1352100223 -0600 commit: trivial-10
+0ec5f433959cd46177f745903353efb5be08d151 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1352100225 -0600 checkout: moving from trivial-10 to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352100270 -0600 checkout: moving from master to trivial-9
+c607fc30883e335def28cd686b51f6cfa02b06ec f0053b8060bb3f0be5cbcc3147a07ece26bf097e Edward Thomson <ethomson@edwardthomson.com> 1352100304 -0600 commit: trivial-9
+f0053b8060bb3f0be5cbcc3147a07ece26bf097e f0053b8060bb3f0be5cbcc3147a07ece26bf097e Edward Thomson <ethomson@edwardthomson.com> 1352100310 -0600 checkout: moving from trivial-9 to trivial-9-branch
+f0053b8060bb3f0be5cbcc3147a07ece26bf097e 13d1be4ea52a6ced1d7a1d832f0ee3c399348e5e Edward Thomson <ethomson@edwardthomson.com> 1352100317 -0600 commit: trivial-9-branch
+13d1be4ea52a6ced1d7a1d832f0ee3c399348e5e f0053b8060bb3f0be5cbcc3147a07ece26bf097e Edward Thomson <ethomson@edwardthomson.com> 1352100319 -0600 checkout: moving from trivial-9-branch to trivial-9
+f0053b8060bb3f0be5cbcc3147a07ece26bf097e c35dee9bcc0e989f3b0c40f68372a9a51b6c4e6a Edward Thomson <ethomson@edwardthomson.com> 1352100333 -0600 commit: trivial-9
+c35dee9bcc0e989f3b0c40f68372a9a51b6c4e6a bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1352100335 -0600 checkout: moving from trivial-9 to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352100576 -0600 checkout: moving from master to trivial-13
+c607fc30883e335def28cd686b51f6cfa02b06ec 8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa Edward Thomson <ethomson@edwardthomson.com> 1352100589 -0600 commit: trivial-13
+8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa 8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa Edward Thomson <ethomson@edwardthomson.com> 1352100604 -0600 checkout: moving from trivial-13 to trivial-13-branch
+8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa 05f3c1a2a56ca95c3d2ef28dc9ddf32b5cd6c91c Edward Thomson <ethomson@edwardthomson.com> 1352100610 -0600 commit: trivial-13-branch
+05f3c1a2a56ca95c3d2ef28dc9ddf32b5cd6c91c 8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa Edward Thomson <ethomson@edwardthomson.com> 1352100612 -0600 checkout: moving from trivial-13-branch to trivial-13
+8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa a3fabece9eb8748da810e1e08266fef9b7136ad4 Edward Thomson <ethomson@edwardthomson.com> 1352100625 -0600 commit: trivial-13
+a3fabece9eb8748da810e1e08266fef9b7136ad4 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1352100627 -0600 checkout: moving from trivial-13 to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352100936 -0600 checkout: moving from master to trivial-11
+c607fc30883e335def28cd686b51f6cfa02b06ec 35632e43612c06a3ea924bfbacd48333da874c29 Edward Thomson <ethomson@edwardthomson.com> 1352100958 -0600 commit: trivial-11
+35632e43612c06a3ea924bfbacd48333da874c29 35632e43612c06a3ea924bfbacd48333da874c29 Edward Thomson <ethomson@edwardthomson.com> 1352100964 -0600 checkout: moving from trivial-11 to trivial-11-branch
+35632e43612c06a3ea924bfbacd48333da874c29 6718a45909532d1fcf5600d0877f7fe7e78f0b86 Edward Thomson <ethomson@edwardthomson.com> 1352100978 -0600 commit: trivial-11-branch
+6718a45909532d1fcf5600d0877f7fe7e78f0b86 35632e43612c06a3ea924bfbacd48333da874c29 Edward Thomson <ethomson@edwardthomson.com> 1352100981 -0600 checkout: moving from trivial-11-branch to trivial-11
+35632e43612c06a3ea924bfbacd48333da874c29 3168dca1a561889b045a6441909f4c56145e666d Edward Thomson <ethomson@edwardthomson.com> 1352100992 -0600 commit: trivial-11
+3168dca1a561889b045a6441909f4c56145e666d bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1352100996 -0600 checkout: moving from trivial-11 to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352101098 -0600 checkout: moving from master to trivial-14
+c607fc30883e335def28cd686b51f6cfa02b06ec 596803b523203a4851c824c07366906f8353f4ad Edward Thomson <ethomson@edwardthomson.com> 1352101113 -0600 commit: trivial-14
+596803b523203a4851c824c07366906f8353f4ad 596803b523203a4851c824c07366906f8353f4ad Edward Thomson <ethomson@edwardthomson.com> 1352101117 -0600 checkout: moving from trivial-14 to trivial-14-branch
+596803b523203a4851c824c07366906f8353f4ad 8187117062b750eed4f93fd7e899f17b52ce554d Edward Thomson <ethomson@edwardthomson.com> 1352101132 -0600 commit: trivial-14-branch
+8187117062b750eed4f93fd7e899f17b52ce554d 596803b523203a4851c824c07366906f8353f4ad Edward Thomson <ethomson@edwardthomson.com> 1352101135 -0600 checkout: moving from trivial-14-branch to trivial-14
+596803b523203a4851c824c07366906f8353f4ad 7e2d058d5fedf8329db44db4fac610d6b1a89159 Edward Thomson <ethomson@edwardthomson.com> 1352101141 -0600 commit: trivial-14
+7e2d058d5fedf8329db44db4fac610d6b1a89159 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1352101145 -0600 checkout: moving from trivial-14 to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1353177749 -0600 checkout: moving from master to renames1
+c607fc30883e335def28cd686b51f6cfa02b06ec 412b32fb66137366147f1801ecc962452757d48a Edward Thomson <ethomson@edwardthomson.com> 1353177886 -0600 commit: renames
+412b32fb66137366147f1801ecc962452757d48a bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1353794607 -0600 checkout: moving from renames1 to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1353794647 -0600 checkout: moving from master to renames2
+bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1353794677 -0600 reset: moving to c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec ab40af3cb8a3ed2e2843e96d9aa7871336b94573 Edward Thomson <ethomson@edwardthomson.com> 1353794852 -0600 commit: renames2
+ab40af3cb8a3ed2e2843e96d9aa7871336b94573 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1353794883 -0600 checkout: moving from renames2 to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1354574697 -0600 checkout: moving from master to df_side1
+bd593285fc7fe4ca18ccdbabf027f5d689101452 d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson <ethomson@edwardthomson.com> 1354574962 -0600 commit: df_ancestor
+d4207f77243500bec335ab477f9227fcdb1e271a c94b27e41064c521120627e07e2035cca1d24ffa Edward Thomson <ethomson@edwardthomson.com> 1354575027 -0600 commit: df_side1
+c94b27e41064c521120627e07e2035cca1d24ffa d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson <ethomson@edwardthomson.com> 1354575070 -0600 checkout: moving from df_side1 to df_side2
+d4207f77243500bec335ab477f9227fcdb1e271a f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 Edward Thomson <ethomson@edwardthomson.com> 1354575206 -0600 commit: df_side2
+f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1354575381 -0600 checkout: moving from df_side2 to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 c94b27e41064c521120627e07e2035cca1d24ffa Edward Thomson <ethomson@edwardthomson.com> 1355017614 -0600 checkout: moving from master to df_side1
+c94b27e41064c521120627e07e2035cca1d24ffa a90bc3fb6f15181972a2959a921429efbd81a473 Edward Thomson <ethomson@edwardthomson.com> 1355017650 -0600 commit: df_added
+a90bc3fb6f15181972a2959a921429efbd81a473 c94b27e41064c521120627e07e2035cca1d24ffa Edward Thomson <ethomson@edwardthomson.com> 1355017673 -0600 checkout: moving from df_side1 to c94b27e
+c94b27e41064c521120627e07e2035cca1d24ffa d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson <ethomson@edwardthomson.com> 1355017673 -0600 rebase -i (squash): updating HEAD
+d4207f77243500bec335ab477f9227fcdb1e271a 005b6fcc8fec71d2550bef8462d169b3c26aa14b Edward Thomson <ethomson@edwardthomson.com> 1355017673 -0600 rebase -i (squash): df_side1
+005b6fcc8fec71d2550bef8462d169b3c26aa14b 005b6fcc8fec71d2550bef8462d169b3c26aa14b Edward Thomson <ethomson@edwardthomson.com> 1355017676 -0600 rebase -i (finish): returning to refs/heads/df_side1
+005b6fcc8fec71d2550bef8462d169b3c26aa14b f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 Edward Thomson <ethomson@edwardthomson.com> 1355017715 -0600 reset: moving to df_side2
+f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 8c749d9968d4b10dcfb06c9f97d0e5d92d337071 Edward Thomson <ethomson@edwardthomson.com> 1355017744 -0600 commit: df_added
+8c749d9968d4b10dcfb06c9f97d0e5d92d337071 f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 Edward Thomson <ethomson@edwardthomson.com> 1355017754 -0600 checkout: moving from df_side1 to f8958bd
+f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson <ethomson@edwardthomson.com> 1355017754 -0600 rebase -i (squash): updating HEAD
+d4207f77243500bec335ab477f9227fcdb1e271a 0204a84f822acbf6386b36d33f1f6bc68bbbf858 Edward Thomson <ethomson@edwardthomson.com> 1355017754 -0600 rebase -i (squash): df_side2
+0204a84f822acbf6386b36d33f1f6bc68bbbf858 0204a84f822acbf6386b36d33f1f6bc68bbbf858 Edward Thomson <ethomson@edwardthomson.com> 1355017756 -0600 rebase -i (finish): returning to refs/heads/df_side1
+0204a84f822acbf6386b36d33f1f6bc68bbbf858 005b6fcc8fec71d2550bef8462d169b3c26aa14b Edward Thomson <ethomson@edwardthomson.com> 1355017793 -0600 reset: moving to 005b6fcc8fec71d2550bef8462d169b3c26aa14b
+005b6fcc8fec71d2550bef8462d169b3c26aa14b 0204a84f822acbf6386b36d33f1f6bc68bbbf858 Edward Thomson <ethomson@edwardthomson.com> 1355017826 -0600 reset: moving to 0204a84
+0204a84f822acbf6386b36d33f1f6bc68bbbf858 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1355017847 -0600 checkout: moving from df_side1 to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 0204a84f822acbf6386b36d33f1f6bc68bbbf858 Edward Thomson <ethomson@edwardthomson.com> 1355168677 -0600 checkout: moving from master to df_side1
+005b6fcc8fec71d2550bef8462d169b3c26aa14b 005b6fcc8fec71d2550bef8462d169b3c26aa14b Edward Thomson <ethomson@edwardthomson.com> 1355168829 -0600 checkout: moving from df_side1 to df_side1
+005b6fcc8fec71d2550bef8462d169b3c26aa14b 005b6fcc8fec71d2550bef8462d169b3c26aa14b Edward Thomson <ethomson@edwardthomson.com> 1355168838 -0600 checkout: moving from df_side1 to df_side1
+005b6fcc8fec71d2550bef8462d169b3c26aa14b e8107f24196736b870a318a0e28f048e29f6feff Edward Thomson <ethomson@edwardthomson.com> 1355169065 -0600 commit: df_side1
+e8107f24196736b870a318a0e28f048e29f6feff 005b6fcc8fec71d2550bef8462d169b3c26aa14b Edward Thomson <ethomson@edwardthomson.com> 1355169081 -0600 checkout: moving from df_side1 to 005b6fc
+005b6fcc8fec71d2550bef8462d169b3c26aa14b d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson <ethomson@edwardthomson.com> 1355169081 -0600 rebase -i (squash): updating HEAD
+d4207f77243500bec335ab477f9227fcdb1e271a 80a8fbb3abb1ba423d554e9630b8fc2e5698f86b Edward Thomson <ethomson@edwardthomson.com> 1355169081 -0600 rebase -i (squash): df_side1
+80a8fbb3abb1ba423d554e9630b8fc2e5698f86b 80a8fbb3abb1ba423d554e9630b8fc2e5698f86b Edward Thomson <ethomson@edwardthomson.com> 1355169084 -0600 rebase -i (finish): returning to refs/heads/df_side1
+80a8fbb3abb1ba423d554e9630b8fc2e5698f86b 0204a84f822acbf6386b36d33f1f6bc68bbbf858 Edward Thomson <ethomson@edwardthomson.com> 1355169141 -0600 checkout: moving from df_side1 to df_side2
+0204a84f822acbf6386b36d33f1f6bc68bbbf858 944f5dd1a867cab4c2bbcb896493435cae1dcc1a Edward Thomson <ethomson@edwardthomson.com> 1355169174 -0600 commit: both
+944f5dd1a867cab4c2bbcb896493435cae1dcc1a 0204a84f822acbf6386b36d33f1f6bc68bbbf858 Edward Thomson <ethomson@edwardthomson.com> 1355169182 -0600 checkout: moving from df_side2 to 0204a84
+0204a84f822acbf6386b36d33f1f6bc68bbbf858 d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson <ethomson@edwardthomson.com> 1355169182 -0600 rebase -i (squash): updating HEAD
+d4207f77243500bec335ab477f9227fcdb1e271a 57079a46233ae2b6df62e9ade71c4948512abefb Edward Thomson <ethomson@edwardthomson.com> 1355169182 -0600 rebase -i (squash): df_side2
+57079a46233ae2b6df62e9ade71c4948512abefb 57079a46233ae2b6df62e9ade71c4948512abefb Edward Thomson <ethomson@edwardthomson.com> 1355169185 -0600 rebase -i (finish): returning to refs/heads/df_side2
+57079a46233ae2b6df62e9ade71c4948512abefb 80a8fbb3abb1ba423d554e9630b8fc2e5698f86b Edward Thomson <ethomson@edwardthomson.com> 1355169241 -0600 checkout: moving from df_side2 to df_side1
+80a8fbb3abb1ba423d554e9630b8fc2e5698f86b e65a9bb2af9f4c2d1c375dd0f8f8a46cf9c68812 Edward Thomson <ethomson@edwardthomson.com> 1355169419 -0600 commit: side1
+e65a9bb2af9f4c2d1c375dd0f8f8a46cf9c68812 80a8fbb3abb1ba423d554e9630b8fc2e5698f86b Edward Thomson <ethomson@edwardthomson.com> 1355169431 -0600 checkout: moving from df_side1 to 80a8fbb
+80a8fbb3abb1ba423d554e9630b8fc2e5698f86b d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson <ethomson@edwardthomson.com> 1355169431 -0600 rebase -i (squash): updating HEAD
+d4207f77243500bec335ab477f9227fcdb1e271a 5dc1018e90b19654bee986b7a0c268804d39659d Edward Thomson <ethomson@edwardthomson.com> 1355169431 -0600 rebase -i (squash): df_side1
+5dc1018e90b19654bee986b7a0c268804d39659d 5dc1018e90b19654bee986b7a0c268804d39659d Edward Thomson <ethomson@edwardthomson.com> 1355169435 -0600 rebase -i (finish): returning to refs/heads/df_side1
+5dc1018e90b19654bee986b7a0c268804d39659d 57079a46233ae2b6df62e9ade71c4948512abefb Edward Thomson <ethomson@edwardthomson.com> 1355169439 -0600 checkout: moving from df_side1 to df_side2
+57079a46233ae2b6df62e9ade71c4948512abefb 58e853f66699fd02629fd50bde08082bc005933a Edward Thomson <ethomson@edwardthomson.com> 1355169460 -0600 commit: side2
+58e853f66699fd02629fd50bde08082bc005933a 57079a46233ae2b6df62e9ade71c4948512abefb Edward Thomson <ethomson@edwardthomson.com> 1355169469 -0600 checkout: moving from df_side2 to 57079a4
+57079a46233ae2b6df62e9ade71c4948512abefb d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson <ethomson@edwardthomson.com> 1355169469 -0600 rebase -i (squash): updating HEAD
+d4207f77243500bec335ab477f9227fcdb1e271a fada9356aa3f74622327a3038ae9c6f92e1c5c1d Edward Thomson <ethomson@edwardthomson.com> 1355169469 -0600 rebase -i (squash): df_side2
+fada9356aa3f74622327a3038ae9c6f92e1c5c1d fada9356aa3f74622327a3038ae9c6f92e1c5c1d Edward Thomson <ethomson@edwardthomson.com> 1355169471 -0600 rebase -i (finish): returning to refs/heads/df_side2
+fada9356aa3f74622327a3038ae9c6f92e1c5c1d 5dc1018e90b19654bee986b7a0c268804d39659d Edward Thomson <ethomson@edwardthomson.com> 1355169494 -0600 checkout: moving from df_side2 to df_side1
+5dc1018e90b19654bee986b7a0c268804d39659d d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson <ethomson@edwardthomson.com> 1355169663 -0600 checkout: moving from df_side1 to d4207f77243500bec335ab477f9227fcdb1e271a
+d4207f77243500bec335ab477f9227fcdb1e271a 849619b03ae540acee4d1edec96b86993da6b497 Edward Thomson <ethomson@edwardthomson.com> 1355169683 -0600 commit: both_dirs
+849619b03ae540acee4d1edec96b86993da6b497 d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson <ethomson@edwardthomson.com> 1355169691 -0600 checkout: moving from 849619b03ae540acee4d1edec96b86993da6b497 to d4207f7
+d4207f77243500bec335ab477f9227fcdb1e271a bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1355169691 -0600 rebase -i (squash): updating HEAD
+bd593285fc7fe4ca18ccdbabf027f5d689101452 a765fb87eb2f7a1920b73b2d5a057f8f8476a42b Edward Thomson <ethomson@edwardthomson.com> 1355169691 -0600 rebase -i (squash): df_ancestor
+a765fb87eb2f7a1920b73b2d5a057f8f8476a42b 5dc1018e90b19654bee986b7a0c268804d39659d Edward Thomson <ethomson@edwardthomson.com> 1355169706 -0600 checkout: moving from a765fb87eb2f7a1920b73b2d5a057f8f8476a42b to df_side1
+5dc1018e90b19654bee986b7a0c268804d39659d a765fb87eb2f7a1920b73b2d5a057f8f8476a42b Edward Thomson <ethomson@edwardthomson.com> 1355169715 -0600 checkout: moving from df_side1 to a765fb87eb2f7a1920b73b2d5a057f8f8476a42b^0
+a765fb87eb2f7a1920b73b2d5a057f8f8476a42b bc744705e1d8a019993cf88f62bc4020f1b80919 Edward Thomson <ethomson@edwardthomson.com> 1355169801 -0600 commit: df_side1
+bc744705e1d8a019993cf88f62bc4020f1b80919 bc744705e1d8a019993cf88f62bc4020f1b80919 Edward Thomson <ethomson@edwardthomson.com> 1355169822 -0600 checkout: moving from bc744705e1d8a019993cf88f62bc4020f1b80919 to df_side1
+bc744705e1d8a019993cf88f62bc4020f1b80919 fada9356aa3f74622327a3038ae9c6f92e1c5c1d Edward Thomson <ethomson@edwardthomson.com> 1355169826 -0600 checkout: moving from df_side1 to df_side2
+fada9356aa3f74622327a3038ae9c6f92e1c5c1d a765fb87eb2f7a1920b73b2d5a057f8f8476a42b Edward Thomson <ethomson@edwardthomson.com> 1355169866 -0600 checkout: moving from df_side2 to a765fb87eb2f7a1920b73b2d5a057f8f8476a42b^0
+a765fb87eb2f7a1920b73b2d5a057f8f8476a42b 95646149ab6b6ba6edc83cff678582538b457b2b Edward Thomson <ethomson@edwardthomson.com> 1355169897 -0600 rebase: df_side2
+95646149ab6b6ba6edc83cff678582538b457b2b 95646149ab6b6ba6edc83cff678582538b457b2b Edward Thomson <ethomson@edwardthomson.com> 1355169897 -0600 rebase finished: returning to refs/heads/df_side2
+95646149ab6b6ba6edc83cff678582538b457b2b bc744705e1d8a019993cf88f62bc4020f1b80919 Edward Thomson <ethomson@edwardthomson.com> 1355169949 -0600 checkout: moving from df_side2 to df_side1
+bc744705e1d8a019993cf88f62bc4020f1b80919 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1355170046 -0600 checkout: moving from df_side1 to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1355181639 -0600 checkout: moving from master to df_ancestor
+bd593285fc7fe4ca18ccdbabf027f5d689101452 2da538570bc1e5b2c3e855bf702f35248ad0735f Edward Thomson <ethomson@edwardthomson.com> 1355181673 -0600 commit: df_ancestor
+2da538570bc1e5b2c3e855bf702f35248ad0735f a7dbfcbfc1a60709cb80b5ca24539008456531d0 Edward Thomson <ethomson@edwardthomson.com> 1355181715 -0600 commit: df_side1
+a7dbfcbfc1a60709cb80b5ca24539008456531d0 a7dbfcbfc1a60709cb80b5ca24539008456531d0 Edward Thomson <ethomson@edwardthomson.com> 1355181743 -0600 checkout: moving from df_ancestor to df_ancestor
+a7dbfcbfc1a60709cb80b5ca24539008456531d0 9a301fbe6fada7dcb74fcd7c20269b5c743459a7 Edward Thomson <ethomson@edwardthomson.com> 1355181775 -0600 commit: df_side2
+9a301fbe6fada7dcb74fcd7c20269b5c743459a7 a7dbfcbfc1a60709cb80b5ca24539008456531d0 Edward Thomson <ethomson@edwardthomson.com> 1355181793 -0600 checkout: moving from df_ancestor to df_side1
+a7dbfcbfc1a60709cb80b5ca24539008456531d0 9a301fbe6fada7dcb74fcd7c20269b5c743459a7 Edward Thomson <ethomson@edwardthomson.com> 1355181797 -0600 checkout: moving from df_side1 to df_side2
+9a301fbe6fada7dcb74fcd7c20269b5c743459a7 9a301fbe6fada7dcb74fcd7c20269b5c743459a7 Edward Thomson <ethomson@edwardthomson.com> 1355182062 -0600 checkout: moving from df_side2 to df_ancestor
+9a301fbe6fada7dcb74fcd7c20269b5c743459a7 2da538570bc1e5b2c3e855bf702f35248ad0735f Edward Thomson <ethomson@edwardthomson.com> 1355182067 -0600 reset: moving to 2da538570bc1e5b2c3e855bf702f35248ad0735f
+2da538570bc1e5b2c3e855bf702f35248ad0735f 2da538570bc1e5b2c3e855bf702f35248ad0735f Edward Thomson <ethomson@edwardthomson.com> 1355182087 -0600 checkout: moving from df_ancestor to df_side2
+2da538570bc1e5b2c3e855bf702f35248ad0735f fc90237dc4891fa6c69827fc465632225e391618 Edward Thomson <ethomson@edwardthomson.com> 1355182104 -0600 commit: df_side2
+fc90237dc4891fa6c69827fc465632225e391618 a7dbfcbfc1a60709cb80b5ca24539008456531d0 Edward Thomson <ethomson@edwardthomson.com> 1355182111 -0600 checkout: moving from df_side2 to df_side1
+a7dbfcbfc1a60709cb80b5ca24539008456531d0 fc90237dc4891fa6c69827fc465632225e391618 Edward Thomson <ethomson@edwardthomson.com> 1355182115 -0600 checkout: moving from df_side1 to df_side2
+fc90237dc4891fa6c69827fc465632225e391618 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1355182122 -0600 checkout: moving from df_side2 to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 d6cf6c7741b3316826af1314042550c97ded1d50 Edward Thomson <ethomson@edwardthomson.com> 1358997543 -0600 checkout: moving from master to unrelated
+d6cf6c7741b3316826af1314042550c97ded1d50 55b4e4687e7a0d9ca367016ed930f385d4022e6f Edward Thomson <ethomson@edwardthomson.com> 1358997664 -0600 commit: conflicting changes
+55b4e4687e7a0d9ca367016ed930f385d4022e6f bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1358997675 -0600 checkout: moving from unrelated to master
+bd593285fc7fe4ca18ccdbabf027f5d689101452 88e185910a15cd13bdf44854ad037f4842b03b29 Edward Thomson <ethomson@microsoft.com> 1365714471 -0500 checkout: moving from master to rename_conflict_ours
+88e185910a15cd13bdf44854ad037f4842b03b29 bef6e37b3ee632ba74159168836f382fed21d77d Edward Thomson <ethomson@microsoft.com> 1365714516 -0500 checkout: moving from rename_conflict_ours to bef6e37b3ee632ba74159168836f382fed21d77d
+bef6e37b3ee632ba74159168836f382fed21d77d 01f149e1b8f84bd8896aaff6d6b22af88459ded0 Edward Thomson <ethomson@microsoft.com> 1365714831 -0500 commit: rename ancestor
+0000000000000000000000000000000000000000 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson <ethomson@microsoft.com> 1365714958 -0500 commit (initial): rename conflict ancestor
+2392a2dacc9efb562b8635d6579fb458751c7c5b 88e185910a15cd13bdf44854ad037f4842b03b29 Edward Thomson <ethomson@microsoft.com> 1365714980 -0500 checkout: moving from rename_conflict_ancestor to rename_conflict_ours
+88e185910a15cd13bdf44854ad037f4842b03b29 7c2c5228c9e90170d4a35e6558e47163daf092e5 Edward Thomson <ethomson@microsoft.com> 1365715250 -0500 commit: rename conflict ours
+7c2c5228c9e90170d4a35e6558e47163daf092e5 2f4024ce528d36d8670c289cce5a7963e625bb0c Edward Thomson <ethomson@microsoft.com> 1365715274 -0500 checkout: moving from rename_conflict_ours to rename_conflict_theirs
+2f4024ce528d36d8670c289cce5a7963e625bb0c 56a638b76b75e068590ac999c2f8621e7f3e264c Edward Thomson <ethomson@microsoft.com> 1365715362 -0500 commit: rename conflict theirs
+56a638b76b75e068590ac999c2f8621e7f3e264c 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson <ethomson@microsoft.com> 1365715368 -0500 checkout: moving from rename_conflict_theirs to rename_conflict_ancestor
+2392a2dacc9efb562b8635d6579fb458751c7c5b 56a638b76b75e068590ac999c2f8621e7f3e264c Edward Thomson <ethomson@microsoft.com> 1365715371 -0500 checkout: moving from rename_conflict_ancestor to rename_conflict_theirs
+56a638b76b75e068590ac999c2f8621e7f3e264c 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson <ethomson@microsoft.com> 1365715404 -0500 checkout: moving from rename_conflict_theirs to rename_conflict_ancestor
+2392a2dacc9efb562b8635d6579fb458751c7c5b 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson <ethomson@microsoft.com> 1365715438 -0500 checkout: moving from rename_conflict_ancestor to rename_conflict_ours
+2392a2dacc9efb562b8635d6579fb458751c7c5b 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson <ethomson@microsoft.com> 1365715480 -0500 checkout: moving from rename_conflict_ours to rename_conflict_ancestor
+2392a2dacc9efb562b8635d6579fb458751c7c5b 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson <ethomson@microsoft.com> 1365715486 -0500 checkout: moving from rename_conflict_ancestor to rename_conflict_ours
+2392a2dacc9efb562b8635d6579fb458751c7c5b f3293571dcd708b6a3faf03818cd2844d000e198 Edward Thomson <ethomson@microsoft.com> 1365715538 -0500 commit: rename conflict ours
+f3293571dcd708b6a3faf03818cd2844d000e198 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson <ethomson@microsoft.com> 1365715546 -0500 checkout: moving from rename_conflict_ours to rename_conflict_ancestor
+2392a2dacc9efb562b8635d6579fb458751c7c5b 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson <ethomson@microsoft.com> 1365715550 -0500 checkout: moving from rename_conflict_ancestor to rename_conflict_thiers
+2392a2dacc9efb562b8635d6579fb458751c7c5b 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson <ethomson@microsoft.com> 1365715554 -0500 checkout: moving from rename_conflict_thiers to rename_conflict_ancestor
+2392a2dacc9efb562b8635d6579fb458751c7c5b 2392a2dacc9efb562b8635d6579fb458751c7c5b Edward Thomson <ethomson@microsoft.com> 1365715557 -0500 checkout: moving from rename_conflict_ancestor to rename_conflict_theirs
+2392a2dacc9efb562b8635d6579fb458751c7c5b a802e06f1782a9645b9851bc7202cee74a8a4972 Edward Thomson <ethomson@microsoft.com> 1365715572 -0500 commit: rename conflict theirs
+a802e06f1782a9645b9851bc7202cee74a8a4972 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@microsoft.com> 1365715620 -0500 checkout: moving from rename_conflict_theirs to master
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/branch b/tests/resources/merge-resolve.git/logs/refs/heads/branch
new file mode 100644
index 0000000..8b0acb7
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/branch
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1351563886 -0500 branch: Created from HEAD
+c607fc30883e335def28cd686b51f6cfa02b06ec 7cb63eed597130ba4abb87b3e544b85021905520 Edward Thomson <ethomson@edwardthomson.com> 1351563965 -0500 commit: branch
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/df_ancestor b/tests/resources/merge-resolve.git/logs/refs/heads/df_ancestor
new file mode 100644
index 0000000..df7695a
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/df_ancestor
@@ -0,0 +1,5 @@
+0000000000000000000000000000000000000000 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1355181639 -0600 branch: Created from HEAD
+bd593285fc7fe4ca18ccdbabf027f5d689101452 2da538570bc1e5b2c3e855bf702f35248ad0735f Edward Thomson <ethomson@edwardthomson.com> 1355181673 -0600 commit: df_ancestor
+2da538570bc1e5b2c3e855bf702f35248ad0735f a7dbfcbfc1a60709cb80b5ca24539008456531d0 Edward Thomson <ethomson@edwardthomson.com> 1355181715 -0600 commit: df_side1
+a7dbfcbfc1a60709cb80b5ca24539008456531d0 9a301fbe6fada7dcb74fcd7c20269b5c743459a7 Edward Thomson <ethomson@edwardthomson.com> 1355181775 -0600 commit: df_side2
+9a301fbe6fada7dcb74fcd7c20269b5c743459a7 2da538570bc1e5b2c3e855bf702f35248ad0735f Edward Thomson <ethomson@edwardthomson.com> 1355182067 -0600 reset: moving to 2da538570bc1e5b2c3e855bf702f35248ad0735f
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/df_side1 b/tests/resources/merge-resolve.git/logs/refs/heads/df_side1
new file mode 100644
index 0000000..a504ad6
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/df_side1
@@ -0,0 +1,14 @@
+0000000000000000000000000000000000000000 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1354574697 -0600 branch: Created from HEAD
+bd593285fc7fe4ca18ccdbabf027f5d689101452 d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson <ethomson@edwardthomson.com> 1354574962 -0600 commit: df_ancestor
+d4207f77243500bec335ab477f9227fcdb1e271a c94b27e41064c521120627e07e2035cca1d24ffa Edward Thomson <ethomson@edwardthomson.com> 1354575027 -0600 commit: df_side1
+c94b27e41064c521120627e07e2035cca1d24ffa a90bc3fb6f15181972a2959a921429efbd81a473 Edward Thomson <ethomson@edwardthomson.com> 1355017650 -0600 commit: df_added
+a90bc3fb6f15181972a2959a921429efbd81a473 005b6fcc8fec71d2550bef8462d169b3c26aa14b Edward Thomson <ethomson@edwardthomson.com> 1355017676 -0600 rebase -i (finish): refs/heads/df_side1 onto c94b27e
+005b6fcc8fec71d2550bef8462d169b3c26aa14b f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 Edward Thomson <ethomson@edwardthomson.com> 1355017715 -0600 reset: moving to df_side2
+f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 8c749d9968d4b10dcfb06c9f97d0e5d92d337071 Edward Thomson <ethomson@edwardthomson.com> 1355017744 -0600 commit: df_added
+8c749d9968d4b10dcfb06c9f97d0e5d92d337071 0204a84f822acbf6386b36d33f1f6bc68bbbf858 Edward Thomson <ethomson@edwardthomson.com> 1355017756 -0600 rebase -i (finish): refs/heads/df_side1 onto f8958bd
+0204a84f822acbf6386b36d33f1f6bc68bbbf858 005b6fcc8fec71d2550bef8462d169b3c26aa14b Edward Thomson <ethomson@edwardthomson.com> 1355017793 -0600 reset: moving to 005b6fcc8fec71d2550bef8462d169b3c26aa14b
+005b6fcc8fec71d2550bef8462d169b3c26aa14b 0204a84f822acbf6386b36d33f1f6bc68bbbf858 Edward Thomson <ethomson@edwardthomson.com> 1355017826 -0600 reset: moving to 0204a84
+005b6fcc8fec71d2550bef8462d169b3c26aa14b e8107f24196736b870a318a0e28f048e29f6feff Edward Thomson <ethomson@edwardthomson.com> 1355169065 -0600 commit: df_side1
+e8107f24196736b870a318a0e28f048e29f6feff 80a8fbb3abb1ba423d554e9630b8fc2e5698f86b Edward Thomson <ethomson@edwardthomson.com> 1355169084 -0600 rebase -i (finish): refs/heads/df_side1 onto 005b6fc
+80a8fbb3abb1ba423d554e9630b8fc2e5698f86b e65a9bb2af9f4c2d1c375dd0f8f8a46cf9c68812 Edward Thomson <ethomson@edwardthomson.com> 1355169419 -0600 commit: side1
+e65a9bb2af9f4c2d1c375dd0f8f8a46cf9c68812 5dc1018e90b19654bee986b7a0c268804d39659d Edward Thomson <ethomson@edwardthomson.com> 1355169435 -0600 rebase -i (finish): refs/heads/df_side1 onto 80a8fbb
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/df_side2 b/tests/resources/merge-resolve.git/logs/refs/heads/df_side2
new file mode 100644
index 0000000..27d833e
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/df_side2
@@ -0,0 +1,9 @@
+0000000000000000000000000000000000000000 d4207f77243500bec335ab477f9227fcdb1e271a Edward Thomson <ethomson@edwardthomson.com> 1354575051 -0600 branch: Created from d4207f77243500bec335ab477f9227fcdb1e271a
+d4207f77243500bec335ab477f9227fcdb1e271a f8958bdf4d365a84a9a178b1f5f35ff1dacbd884 Edward Thomson <ethomson@edwardthomson.com> 1354575206 -0600 commit: df_side2
+0204a84f822acbf6386b36d33f1f6bc68bbbf858 944f5dd1a867cab4c2bbcb896493435cae1dcc1a Edward Thomson <ethomson@edwardthomson.com> 1355169174 -0600 commit: both
+944f5dd1a867cab4c2bbcb896493435cae1dcc1a 57079a46233ae2b6df62e9ade71c4948512abefb Edward Thomson <ethomson@edwardthomson.com> 1355169185 -0600 rebase -i (finish): refs/heads/df_side2 onto 0204a84
+57079a46233ae2b6df62e9ade71c4948512abefb 58e853f66699fd02629fd50bde08082bc005933a Edward Thomson <ethomson@edwardthomson.com> 1355169460 -0600 commit: side2
+58e853f66699fd02629fd50bde08082bc005933a fada9356aa3f74622327a3038ae9c6f92e1c5c1d Edward Thomson <ethomson@edwardthomson.com> 1355169471 -0600 rebase -i (finish): refs/heads/df_side2 onto 57079a4
+fada9356aa3f74622327a3038ae9c6f92e1c5c1d 95646149ab6b6ba6edc83cff678582538b457b2b Edward Thomson <ethomson@edwardthomson.com> 1355169897 -0600 rebase finished: refs/heads/df_side2 onto a765fb87eb2f7a1920b73b2d5a057f8f8476a42b
+0000000000000000000000000000000000000000 2da538570bc1e5b2c3e855bf702f35248ad0735f Edward Thomson <ethomson@edwardthomson.com> 1355182087 -0600 branch: Created from HEAD
+2da538570bc1e5b2c3e855bf702f35248ad0735f fc90237dc4891fa6c69827fc465632225e391618 Edward Thomson <ethomson@edwardthomson.com> 1355182104 -0600 commit: df_side2
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/ff_branch b/tests/resources/merge-resolve.git/logs/refs/heads/ff_branch
new file mode 100644
index 0000000..c470617
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/ff_branch
@@ -0,0 +1,5 @@
+0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351605785 -0500 branch: Created from HEAD
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 33d500f588fbbe65901d82b4e6b008e549064be0 Edward Thomson <ethomson@edwardthomson.com> 1351605830 -0500 commit: fastforward
+33d500f588fbbe65901d82b4e6b008e549064be0 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1351990202 -0500 reset: moving to c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1351990205 -0500 merge master: Fast-forward
+bd593285fc7fe4ca18ccdbabf027f5d689101452 fd89f8cffb663ac89095a0f9764902e93ceaca6a Edward Thomson <ethomson@edwardthomson.com> 1351990229 -0500 commit: fastforward
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/master b/tests/resources/merge-resolve.git/logs/refs/heads/master
new file mode 100644
index 0000000..6047599
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/master
@@ -0,0 +1,5 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1351563869 -0500 commit (initial): initial
+c607fc30883e335def28cd686b51f6cfa02b06ec 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351564033 -0500 commit: master
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 4e0d9401aee78eb345a8685a859d37c8c3c0bbed Edward Thomson <ethomson@edwardthomson.com> 1351875091 -0500 merge octo1 octo2 octo3 octo4: Merge made by the 'octopus' strategy.
+4e0d9401aee78eb345a8685a859d37c8c3c0bbed 54269b3f6ec3d7d4ede24dd350dd5d605495c3ae Edward Thomson <ethomson@edwardthomson.com> 1351875108 -0500 reset: moving to 54269b3f6ec3d7d4ede24dd350dd5d605495c3ae
+54269b3f6ec3d7d4ede24dd350dd5d605495c3ae 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351875584 -0500 reset: moving to 977c696519c5a3004c5f1d15d60c89dbeb8f235f
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/octo1 b/tests/resources/merge-resolve.git/logs/refs/heads/octo1
new file mode 100644
index 0000000..0b6c921
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/octo1
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351874933 -0500 branch: Created from HEAD
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 16f825815cfd20a07a75c71554e82d8eede0b061 Edward Thomson <ethomson@edwardthomson.com> 1351874954 -0500 commit: octo1
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/octo2 b/tests/resources/merge-resolve.git/logs/refs/heads/octo2
new file mode 100644
index 0000000..5392a4f
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/octo2
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351874960 -0500 branch: Created from HEAD
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 158dc7bedb202f5b26502bf3574faa7f4238d56c Edward Thomson <ethomson@edwardthomson.com> 1351874974 -0500 commit: octo2
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/octo3 b/tests/resources/merge-resolve.git/logs/refs/heads/octo3
new file mode 100644
index 0000000..7db5617
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/octo3
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351874980 -0500 branch: Created from HEAD
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 50ce7d7d01217679e26c55939eef119e0c93e272 Edward Thomson <ethomson@edwardthomson.com> 1351874998 -0500 commit: octo3
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/octo4 b/tests/resources/merge-resolve.git/logs/refs/heads/octo4
new file mode 100644
index 0000000..b0f9e42
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/octo4
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351875010 -0500 branch: Created from HEAD
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 54269b3f6ec3d7d4ede24dd350dd5d605495c3ae Edward Thomson <ethomson@edwardthomson.com> 1351875023 -0500 commit: octo4
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/octo5 b/tests/resources/merge-resolve.git/logs/refs/heads/octo5
new file mode 100644
index 0000000..614563e
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/octo5
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351875031 -0500 branch: Created from HEAD
+977c696519c5a3004c5f1d15d60c89dbeb8f235f e4f618a2c3ed0669308735727df5ebf2447f022f Edward Thomson <ethomson@edwardthomson.com> 1351875041 -0500 commit: octo5
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/octo6 b/tests/resources/merge-resolve.git/logs/refs/heads/octo6
new file mode 100644
index 0000000..4c812ea
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/octo6
@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 977c696519c5a3004c5f1d15d60c89dbeb8f235f Edward Thomson <ethomson@edwardthomson.com> 1351875046 -0500 branch: Created from HEAD
+977c696519c5a3004c5f1d15d60c89dbeb8f235f 4ca408a8c88655f7586a1b580be6fad138121e98 Edward Thomson <ethomson@edwardthomson.com> 1351875057 -0500 commit: octo5
+4ca408a8c88655f7586a1b580be6fad138121e98 b6f610aef53bd343e6c96227de874c66f00ee8e8 Edward Thomson <ethomson@edwardthomson.com> 1351875065 -0500 commit (amend): octo6
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/renames1 b/tests/resources/merge-resolve.git/logs/refs/heads/renames1
new file mode 100644
index 0000000..58a7e05
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/renames1
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1353177745 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec 412b32fb66137366147f1801ecc962452757d48a Edward Thomson <ethomson@edwardthomson.com> 1353177886 -0600 commit: renames
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/renames2 b/tests/resources/merge-resolve.git/logs/refs/heads/renames2
new file mode 100644
index 0000000..5645ece
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/renames2
@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 bd593285fc7fe4ca18ccdbabf027f5d689101452 Edward Thomson <ethomson@edwardthomson.com> 1353794647 -0600 branch: Created from HEAD
+bd593285fc7fe4ca18ccdbabf027f5d689101452 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1353794677 -0600 reset: moving to c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec ab40af3cb8a3ed2e2843e96d9aa7871336b94573 Edward Thomson <ethomson@edwardthomson.com> 1353794852 -0600 commit: renames2
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-10 b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-10
new file mode 100644
index 0000000..b6bd247
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-10
@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352100171 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec 53825f41ac8d640612f9423a2f03a69f3d96809a Edward Thomson <ethomson@edwardthomson.com> 1352100193 -0600 commit: trivial-10
+53825f41ac8d640612f9423a2f03a69f3d96809a 0ec5f433959cd46177f745903353efb5be08d151 Edward Thomson <ethomson@edwardthomson.com> 1352100223 -0600 commit: trivial-10
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-10-branch b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-10-branch
new file mode 100644
index 0000000..14ce9e5
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-10-branch
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 53825f41ac8d640612f9423a2f03a69f3d96809a Edward Thomson <ethomson@edwardthomson.com> 1352100200 -0600 branch: Created from HEAD
+53825f41ac8d640612f9423a2f03a69f3d96809a 11f4f3c08b737f5fd896cbefa1425ee63b21b2fa Edward Thomson <ethomson@edwardthomson.com> 1352100211 -0600 commit: trivial-10-branch
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-11 b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-11
new file mode 100644
index 0000000..3e6b774
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-11
@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352100930 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec 35632e43612c06a3ea924bfbacd48333da874c29 Edward Thomson <ethomson@edwardthomson.com> 1352100958 -0600 commit: trivial-11
+35632e43612c06a3ea924bfbacd48333da874c29 3168dca1a561889b045a6441909f4c56145e666d Edward Thomson <ethomson@edwardthomson.com> 1352100992 -0600 commit: trivial-11
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-11-branch b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-11-branch
new file mode 100644
index 0000000..30d5ec7
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-11-branch
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 35632e43612c06a3ea924bfbacd48333da874c29 Edward Thomson <ethomson@edwardthomson.com> 1352100964 -0600 branch: Created from HEAD
+35632e43612c06a3ea924bfbacd48333da874c29 6718a45909532d1fcf5600d0877f7fe7e78f0b86 Edward Thomson <ethomson@edwardthomson.com> 1352100978 -0600 commit: trivial-11-branch
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-13 b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-13
new file mode 100644
index 0000000..3a7302d
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-13
@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352100559 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec 8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa Edward Thomson <ethomson@edwardthomson.com> 1352100589 -0600 commit: trivial-13
+8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa a3fabece9eb8748da810e1e08266fef9b7136ad4 Edward Thomson <ethomson@edwardthomson.com> 1352100625 -0600 commit: trivial-13
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-13-branch b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-13-branch
new file mode 100644
index 0000000..bb26042
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-13-branch
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa Edward Thomson <ethomson@edwardthomson.com> 1352100604 -0600 branch: Created from HEAD
+8f4433f8593ddd65b7dd43dd4564d841f4d9c8aa 05f3c1a2a56ca95c3d2ef28dc9ddf32b5cd6c91c Edward Thomson <ethomson@edwardthomson.com> 1352100610 -0600 commit: trivial-13-branch
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-14 b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-14
new file mode 100644
index 0000000..4b70d28
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-14
@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352101083 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec 596803b523203a4851c824c07366906f8353f4ad Edward Thomson <ethomson@edwardthomson.com> 1352101113 -0600 commit: trivial-14
+596803b523203a4851c824c07366906f8353f4ad 7e2d058d5fedf8329db44db4fac610d6b1a89159 Edward Thomson <ethomson@edwardthomson.com> 1352101141 -0600 commit: trivial-14
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-14-branch b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-14-branch
new file mode 100644
index 0000000..8e491ca
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-14-branch
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 596803b523203a4851c824c07366906f8353f4ad Edward Thomson <ethomson@edwardthomson.com> 1352101117 -0600 branch: Created from HEAD
+596803b523203a4851c824c07366906f8353f4ad 8187117062b750eed4f93fd7e899f17b52ce554d Edward Thomson <ethomson@edwardthomson.com> 1352101132 -0600 commit: trivial-14-branch
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-2alt b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-2alt
new file mode 100644
index 0000000..a2a28d4
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-2alt
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352091695 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec 566ab53c220a2eafc1212af1a024513230280ab9 Edward Thomson <ethomson@edwardthomson.com> 1352092452 -0600 commit: 2alt
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-2alt-branch b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-2alt-branch
new file mode 100644
index 0000000..a0a48ae
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-2alt-branch
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352092411 -0600 branch: Created from HEAD
+c607fc30883e335def28cd686b51f6cfa02b06ec c9174cef549ec94ecbc43ef03cdc775b4950becb Edward Thomson <ethomson@edwardthomson.com> 1352092434 -0600 commit: 2alt-branch
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-3alt b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-3alt
new file mode 100644
index 0000000..4374d38
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-3alt
@@ -0,0 +1,3 @@
+566ab53c220a2eafc1212af1a024513230280ab9 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352094547 -0600 reset: moving to c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec 5459c89aa0026d543ce8343bd89871bce543f9c2 Edward Thomson <ethomson@edwardthomson.com> 1352094580 -0600 commit: 3alt
+5459c89aa0026d543ce8343bd89871bce543f9c2 4c9fac0707f8d4195037ae5a681aa48626491541 Edward Thomson <ethomson@edwardthomson.com> 1352094610 -0600 commit: 3alt-branch
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-3alt-branch b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-3alt-branch
new file mode 100644
index 0000000..7a2e6f8
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-3alt-branch
@@ -0,0 +1 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352094594 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-4 b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-4
new file mode 100644
index 0000000..3ee6d25
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-4
@@ -0,0 +1,2 @@
+566ab53c220a2eafc1212af1a024513230280ab9 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352094764 -0600 reset: moving to c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec cc3e3009134cb88014129fc8858d1101359e5e2f Edward Thomson <ethomson@edwardthomson.com> 1352094815 -0600 commit: trivial-4
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-4-branch b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-4-branch
new file mode 100644
index 0000000..51f8a92
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-4-branch
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352094830 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec 183310e30fb1499af8c619108ffea4d300b5e778 Edward Thomson <ethomson@edwardthomson.com> 1352094856 -0600 commit: trivial-4-branch
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-5alt-1 b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-5alt-1
new file mode 100644
index 0000000..1449702
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-5alt-1
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352096606 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec 4fe93c0ec83eb6305cbace3dace88ecee1b63cb6 Edward Thomson <ethomson@edwardthomson.com> 1352096643 -0600 commit: 5alt-1
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-5alt-1-branch b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-5alt-1-branch
new file mode 100644
index 0000000..4cff835
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-5alt-1-branch
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352096657 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec 478172cb2f5ff9b514bc9d04d3bd5ef5840cb3b2 Edward Thomson <ethomson@edwardthomson.com> 1352096689 -0600 commit: 5alt-1-branch
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-5alt-2 b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-5alt-2
new file mode 100644
index 0000000..3ca077b
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-5alt-2
@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352096711 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec ebc09d0137cfb0c26697aed0109fb943ad906f3f Edward Thomson <ethomson@edwardthomson.com> 1352096764 -0600 commit: existing file
+ebc09d0137cfb0c26697aed0109fb943ad906f3f 3b47b031b3e55ae11e14a05260b1c3ffd6838d55 Edward Thomson <ethomson@edwardthomson.com> 1352096815 -0600 commit: 5alt-2
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-5alt-2-branch b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-5alt-2-branch
new file mode 100644
index 0000000..e7bb901
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-5alt-2-branch
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 ebc09d0137cfb0c26697aed0109fb943ad906f3f Edward Thomson <ethomson@edwardthomson.com> 1352096833 -0600 branch: Created from ebc09d0
+ebc09d0137cfb0c26697aed0109fb943ad906f3f f48097eb340dc5a7cae55aabcf1faf4548aa821f Edward Thomson <ethomson@edwardthomson.com> 1352096855 -0600 commit: 5alt-2-branch
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-6 b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-6
new file mode 100644
index 0000000..7c717a2
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-6
@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352097371 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec f7c332bd4d4d4b777366cae4d24d1687477576bf Edward Thomson <ethomson@edwardthomson.com> 1352097389 -0600 commit: 6
+f7c332bd4d4d4b777366cae4d24d1687477576bf 99b4f7e4f24470fa06b980bc21f1095c2a9425c0 Edward Thomson <ethomson@edwardthomson.com> 1352097404 -0600 commit: trivial-6
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-6-branch b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-6-branch
new file mode 100644
index 0000000..715f3ae
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-6-branch
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 f7c332bd4d4d4b777366cae4d24d1687477576bf Edward Thomson <ethomson@edwardthomson.com> 1352097414 -0600 branch: Created from f7c332bd4d4d4b777366cae4d24d1687477576bf
+f7c332bd4d4d4b777366cae4d24d1687477576bf a43150a738849c59376cf30bb2a68348a83c8f48 Edward Thomson <ethomson@edwardthomson.com> 1352097431 -0600 commit: 6-branch
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-7 b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-7
new file mode 100644
index 0000000..a014f17
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-7
@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352099765 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson <ethomson@edwardthomson.com> 1352099790 -0600 commit: trivial-7
+092ce8682d7f3a2a3a769a6daca58950168ba5c4 d874671ef5b20184836cb983bb273e5280384d0b Edward Thomson <ethomson@edwardthomson.com> 1352099947 -0600 commit: trivial-7
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-7-branch b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-7-branch
new file mode 100644
index 0000000..22331d7
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-7-branch
@@ -0,0 +1,5 @@
+0000000000000000000000000000000000000000 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson <ethomson@edwardthomson.com> 1352099799 -0600 branch: Created from HEAD
+092ce8682d7f3a2a3a769a6daca58950168ba5c4 73cbfdc4fe843169e5b2af8dcad03cbf3acf306c Edward Thomson <ethomson@edwardthomson.com> 1352099812 -0600 commit: trivial-7-branch
+73cbfdc4fe843169e5b2af8dcad03cbf3acf306c 092ce8682d7f3a2a3a769a6daca58950168ba5c4 Edward Thomson <ethomson@edwardthomson.com> 1352099874 -0600 reset: moving to 092ce8682d7f3a2a3a769a6daca58950168ba5c4
+092ce8682d7f3a2a3a769a6daca58950168ba5c4 009b9cab6fdac02915a88ecd078b7a792ed802d8 Edward Thomson <ethomson@edwardthomson.com> 1352099921 -0600 commit: removed in 7
+009b9cab6fdac02915a88ecd078b7a792ed802d8 5195a1b480f66691b667f10a9e41e70115a78351 Edward Thomson <ethomson@edwardthomson.com> 1352099927 -0600 commit (amend): trivial-7-branch
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-8 b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-8
new file mode 100644
index 0000000..7670c35
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-8
@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352098816 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec 75a811bf6bc57694adb3fe604786f3a4efd1cd1b Edward Thomson <ethomson@edwardthomson.com> 1352098884 -0600 commit: trivial-8
+75a811bf6bc57694adb3fe604786f3a4efd1cd1b 3575826c96a975031d2c14368529cc5c4353a8fd Edward Thomson <ethomson@edwardthomson.com> 1352099000 -0600 commit: trivial-8
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-8-branch b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-8-branch
new file mode 100644
index 0000000..c4d68ed
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-8-branch
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 75a811bf6bc57694adb3fe604786f3a4efd1cd1b Edward Thomson <ethomson@edwardthomson.com> 1352098947 -0600 branch: Created from HEAD
+75a811bf6bc57694adb3fe604786f3a4efd1cd1b 52d8bc572af2b6d4ee0d5e62ed5d1fbad92210a9 Edward Thomson <ethomson@edwardthomson.com> 1352098979 -0600 commit: trivial-8-branch
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-9 b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-9
new file mode 100644
index 0000000..09a343b
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-9
@@ -0,0 +1,3 @@
+0000000000000000000000000000000000000000 c607fc30883e335def28cd686b51f6cfa02b06ec Edward Thomson <ethomson@edwardthomson.com> 1352100268 -0600 branch: Created from c607fc30883e335def28cd686b51f6cfa02b06ec
+c607fc30883e335def28cd686b51f6cfa02b06ec f0053b8060bb3f0be5cbcc3147a07ece26bf097e Edward Thomson <ethomson@edwardthomson.com> 1352100304 -0600 commit: trivial-9
+f0053b8060bb3f0be5cbcc3147a07ece26bf097e c35dee9bcc0e989f3b0c40f68372a9a51b6c4e6a Edward Thomson <ethomson@edwardthomson.com> 1352100333 -0600 commit: trivial-9
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/trivial-9-branch b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-9-branch
new file mode 100644
index 0000000..1b126fb
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/trivial-9-branch
@@ -0,0 +1,2 @@
+0000000000000000000000000000000000000000 f0053b8060bb3f0be5cbcc3147a07ece26bf097e Edward Thomson <ethomson@edwardthomson.com> 1352100310 -0600 branch: Created from HEAD
+f0053b8060bb3f0be5cbcc3147a07ece26bf097e 13d1be4ea52a6ced1d7a1d832f0ee3c399348e5e Edward Thomson <ethomson@edwardthomson.com> 1352100317 -0600 commit: trivial-9-branch
diff --git a/tests/resources/merge-resolve.git/logs/refs/heads/unrelated b/tests/resources/merge-resolve.git/logs/refs/heads/unrelated
new file mode 100644
index 0000000..a83ffc2
--- /dev/null
+++ b/tests/resources/merge-resolve.git/logs/refs/heads/unrelated
@@ -0,0 +1 @@
+d6cf6c7741b3316826af1314042550c97ded1d50 55b4e4687e7a0d9ca367016ed930f385d4022e6f Edward Thomson <ethomson@edwardthomson.com> 1358997664 -0600 commit: conflicting changes
diff --git a/tests/resources/merge-resolve.git/modules/submodule/HEAD b/tests/resources/merge-resolve.git/modules/submodule/HEAD
new file mode 100644
index 0000000..cb089cd
--- /dev/null
+++ b/tests/resources/merge-resolve.git/modules/submodule/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/master
diff --git a/tests/resources/merge-resolve.git/modules/submodule/ORIG_HEAD b/tests/resources/merge-resolve.git/modules/submodule/ORIG_HEAD
new file mode 100644
index 0000000..d1bfcf0
--- /dev/null
+++ b/tests/resources/merge-resolve.git/modules/submodule/ORIG_HEAD
@@ -0,0 +1 @@
+ae39c77c70cb6bad18bb471912460c4e1ba0f586
diff --git a/tests/resources/merge-resolve.git/modules/submodule/config b/tests/resources/merge-resolve.git/modules/submodule/config
new file mode 100644
index 0000000..6368bed
--- /dev/null
+++ b/tests/resources/merge-resolve.git/modules/submodule/config
@@ -0,0 +1,14 @@
+[core]
+ repositoryformatversion = 0
+ filemode = false
+ bare = true
+ logallrefupdates = true
+ symlinks = false
+ ignorecase = true
+ hideDotFiles = dotGitOnly
+[remote "origin"]
+ url = c:/Temp/TestRepos/submodule
+ fetch = +refs/heads/*:refs/remotes/origin/*
+[branch "master"]
+ remote = origin
+ merge = refs/heads/master
diff --git a/tests/resources/merge-resolve.git/modules/submodule/index b/tests/resources/merge-resolve.git/modules/submodule/index
new file mode 100644
index 0000000..e948afb
Binary files /dev/null and b/tests/resources/merge-resolve.git/modules/submodule/index differ
diff --git a/tests/resources/merge-resolve.git/modules/submodule/info/exclude b/tests/resources/merge-resolve.git/modules/submodule/info/exclude
new file mode 100644
index 0000000..a5196d1
--- /dev/null
+++ b/tests/resources/merge-resolve.git/modules/submodule/info/exclude
@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~
diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/18/fae1354bba0a5f1e6a531f9988369142c24a9e b/tests/resources/merge-resolve.git/modules/submodule/objects/18/fae1354bba0a5f1e6a531f9988369142c24a9e
new file mode 100644
index 0000000..fcf1c63
Binary files /dev/null and b/tests/resources/merge-resolve.git/modules/submodule/objects/18/fae1354bba0a5f1e6a531f9988369142c24a9e differ
diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/29/7aa6cd028b3336c7802c7a6f49143da4e1602d b/tests/resources/merge-resolve.git/modules/submodule/objects/29/7aa6cd028b3336c7802c7a6f49143da4e1602d
new file mode 100644
index 0000000..aa9fc50
Binary files /dev/null and b/tests/resources/merge-resolve.git/modules/submodule/objects/29/7aa6cd028b3336c7802c7a6f49143da4e1602d differ
diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/38/6c80dc813b89d719797668f40c1be0a6efa996 b/tests/resources/merge-resolve.git/modules/submodule/objects/38/6c80dc813b89d719797668f40c1be0a6efa996
new file mode 100644
index 0000000..bc9a32e
Binary files /dev/null and b/tests/resources/merge-resolve.git/modules/submodule/objects/38/6c80dc813b89d719797668f40c1be0a6efa996 differ
diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/ab/435a147bae6d5906ecfd0916a570c4ab3eeea8 b/tests/resources/merge-resolve.git/modules/submodule/objects/ab/435a147bae6d5906ecfd0916a570c4ab3eeea8
new file mode 100644
index 0000000..65a8d75
Binary files /dev/null and b/tests/resources/merge-resolve.git/modules/submodule/objects/ab/435a147bae6d5906ecfd0916a570c4ab3eeea8 differ
diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/ad/16e0a7684ea95bf892980a2ee412293ae979cc b/tests/resources/merge-resolve.git/modules/submodule/objects/ad/16e0a7684ea95bf892980a2ee412293ae979cc
new file mode 100644
index 0000000..49e1aaf
Binary files /dev/null and b/tests/resources/merge-resolve.git/modules/submodule/objects/ad/16e0a7684ea95bf892980a2ee412293ae979cc differ
diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/ae/39c77c70cb6bad18bb471912460c4e1ba0f586 b/tests/resources/merge-resolve.git/modules/submodule/objects/ae/39c77c70cb6bad18bb471912460c4e1ba0f586
new file mode 100644
index 0000000..6ceffdd
--- /dev/null
+++ b/tests/resources/merge-resolve.git/modules/submodule/objects/ae/39c77c70cb6bad18bb471912460c4e1ba0f586
@@ -0,0 +1,2 @@
+x¥ŽË
!@=S
hfù%Æx±†!ëÅ Æö]kðöò/{k©-âa]
xW«s =,lÄP…‰
+Šë#g0KÈêIC¶© –ž–,5ù“1¡– ™9;aãlB«è=×>ô|h}_{{õMŸe·?º¶þêuž¸·‹6˜Àšˆô"€Úí>:å„ʃ6^Õ¤±Kd
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/c2/0765f6e24e8bbb63a648d0d11d84da63170190 b/tests/resources/merge-resolve.git/modules/submodule/objects/c2/0765f6e24e8bbb63a648d0d11d84da63170190
new file mode 100644
index 0000000..1478103
Binary files /dev/null and b/tests/resources/merge-resolve.git/modules/submodule/objects/c2/0765f6e24e8bbb63a648d0d11d84da63170190 differ
diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/d3/d806a4bef96889117fd7ebac0e3cb5ec152932 b/tests/resources/merge-resolve.git/modules/submodule/objects/d3/d806a4bef96889117fd7ebac0e3cb5ec152932
new file mode 100644
index 0000000..8df72a4
--- /dev/null
+++ b/tests/resources/merge-resolve.git/modules/submodule/objects/d3/d806a4bef96889117fd7ebac0e3cb5ec152932
@@ -0,0 +1,3 @@
+x¥A
+Â0E]çse¦mÚDÜx½À$™Ò‚é@šâõgpóø¼ÅQs^+·§ZD€ÃÐ[¦a
+,c² G‰sBO#Û ãÀ¡v†ºhGúpIðZ4ïºÁUšý{^cÑ]çz‰šo@½ÇŽ\çÎèM³-\å ó<BÖt¼æµÌ·ÈA›
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/modules/submodule/objects/f1/065ff5593604072837fecaad3e2e268cb0147b b/tests/resources/merge-resolve.git/modules/submodule/objects/f1/065ff5593604072837fecaad3e2e268cb0147b
new file mode 100644
index 0000000..e0d73e1
Binary files /dev/null and b/tests/resources/merge-resolve.git/modules/submodule/objects/f1/065ff5593604072837fecaad3e2e268cb0147b differ
diff --git a/tests/resources/merge-resolve.git/modules/submodule/packed-refs b/tests/resources/merge-resolve.git/modules/submodule/packed-refs
new file mode 100644
index 0000000..992c4ee
--- /dev/null
+++ b/tests/resources/merge-resolve.git/modules/submodule/packed-refs
@@ -0,0 +1,3 @@
+# pack-refs with: peeled
+297aa6cd028b3336c7802c7a6f49143da4e1602d refs/remotes/origin/master
+ae39c77c70cb6bad18bb471912460c4e1ba0f586 refs/remotes/origin/submodule-branch
diff --git a/tests/resources/merge-resolve.git/modules/submodule/refs/heads/master b/tests/resources/merge-resolve.git/modules/submodule/refs/heads/master
new file mode 100644
index 0000000..fe28256
--- /dev/null
+++ b/tests/resources/merge-resolve.git/modules/submodule/refs/heads/master
@@ -0,0 +1 @@
+297aa6cd028b3336c7802c7a6f49143da4e1602d
diff --git a/tests/resources/merge-resolve.git/modules/submodule/refs/remotes/origin/HEAD b/tests/resources/merge-resolve.git/modules/submodule/refs/remotes/origin/HEAD
new file mode 100644
index 0000000..6efe28f
--- /dev/null
+++ b/tests/resources/merge-resolve.git/modules/submodule/refs/remotes/origin/HEAD
@@ -0,0 +1 @@
+ref: refs/remotes/origin/master
diff --git a/tests/resources/merge-resolve.git/objects/00/5b6fcc8fec71d2550bef8462d169b3c26aa14b b/tests/resources/merge-resolve.git/objects/00/5b6fcc8fec71d2550bef8462d169b3c26aa14b
new file mode 100644
index 0000000..82a8da5
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/00/5b6fcc8fec71d2550bef8462d169b3c26aa14b differ
diff --git a/tests/resources/merge-resolve.git/objects/00/9b9cab6fdac02915a88ecd078b7a792ed802d8 b/tests/resources/merge-resolve.git/objects/00/9b9cab6fdac02915a88ecd078b7a792ed802d8
new file mode 100644
index 0000000..f663a3c
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/00/9b9cab6fdac02915a88ecd078b7a792ed802d8 differ
diff --git a/tests/resources/merge-resolve.git/objects/00/c7d33f1ffa79d19c2272b370fcaeaadba49c08 b/tests/resources/merge-resolve.git/objects/00/c7d33f1ffa79d19c2272b370fcaeaadba49c08
new file mode 100644
index 0000000..72698dc
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/00/c7d33f1ffa79d19c2272b370fcaeaadba49c08 differ
diff --git a/tests/resources/merge-resolve.git/objects/01/f149e1b8f84bd8896aaff6d6b22af88459ded0 b/tests/resources/merge-resolve.git/objects/01/f149e1b8f84bd8896aaff6d6b22af88459ded0
new file mode 100644
index 0000000..aa6336d
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/01/f149e1b8f84bd8896aaff6d6b22af88459ded0 differ
diff --git a/tests/resources/merge-resolve.git/objects/02/04a84f822acbf6386b36d33f1f6bc68bbbf858 b/tests/resources/merge-resolve.git/objects/02/04a84f822acbf6386b36d33f1f6bc68bbbf858
new file mode 100644
index 0000000..2f0a0e1
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/02/04a84f822acbf6386b36d33f1f6bc68bbbf858 differ
diff --git a/tests/resources/merge-resolve.git/objects/02/251f990ca8e92e7ae61d3426163fa821c64001 b/tests/resources/merge-resolve.git/objects/02/251f990ca8e92e7ae61d3426163fa821c64001
new file mode 100644
index 0000000..d623117
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/02/251f990ca8e92e7ae61d3426163fa821c64001 differ
diff --git a/tests/resources/merge-resolve.git/objects/03/21415405cb906c46869919af56d51dbbe5e85c b/tests/resources/merge-resolve.git/objects/03/21415405cb906c46869919af56d51dbbe5e85c
new file mode 100644
index 0000000..277bdcf
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/03/21415405cb906c46869919af56d51dbbe5e85c differ
diff --git a/tests/resources/merge-resolve.git/objects/03/2ebc5ab85d9553bb187d3cd40875ff23a63ed0 b/tests/resources/merge-resolve.git/objects/03/2ebc5ab85d9553bb187d3cd40875ff23a63ed0
new file mode 100644
index 0000000..e5404d8
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/03/2ebc5ab85d9553bb187d3cd40875ff23a63ed0 differ
diff --git a/tests/resources/merge-resolve.git/objects/03/b87706555accbf874ccd410dbda01e8e70a67f b/tests/resources/merge-resolve.git/objects/03/b87706555accbf874ccd410dbda01e8e70a67f
new file mode 100644
index 0000000..0befcd7
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/03/b87706555accbf874ccd410dbda01e8e70a67f differ
diff --git a/tests/resources/merge-resolve.git/objects/03/dad1005e5d06d418f50b12e0bcd48ff2306a03 b/tests/resources/merge-resolve.git/objects/03/dad1005e5d06d418f50b12e0bcd48ff2306a03
new file mode 100644
index 0000000..04011a2
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/03/dad1005e5d06d418f50b12e0bcd48ff2306a03 differ
diff --git a/tests/resources/merge-resolve.git/objects/05/1ffd7901a442faf56b226161649074f15c7c47 b/tests/resources/merge-resolve.git/objects/05/1ffd7901a442faf56b226161649074f15c7c47
new file mode 100644
index 0000000..65fa689
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/05/1ffd7901a442faf56b226161649074f15c7c47
@@ -0,0 +1 @@
+x+)JMU06·`040031QH,-ÉÏM-JOMLÊIÕ+©(aH:,»:ÎCÉýúô:ÞË ²o>ZC'g$楧¦èfæé&%æ%g€5¬ÎqYôÂeÒZoÇÝÙkÚMíæ2éÆÔ›X\’ZDPC~^ZNfrIf^:Xéõ› ZHÙŠž1O(_œ,'º×
jvn~JfZ&Ä5†&ȚؽùÁ„ +gÆz¬Ÿ¥•4íú3Ž^¨¦¢ÔÜü2 ÜüI{•|þ¹÷ 2m» gÜ˾‹©É1ÖËåüŠ5Ó¿Ü ,\“µ})TC)0XÀ¡vÿ‰ùzÖ›¦9–¤×Mü°úÕ…'6óbó#—
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/05/8541fc37114bfc1dddf6bd6bffc7fae5c2e6fe b/tests/resources/merge-resolve.git/objects/05/8541fc37114bfc1dddf6bd6bffc7fae5c2e6fe
new file mode 100644
index 0000000..d79dc30
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/05/8541fc37114bfc1dddf6bd6bffc7fae5c2e6fe differ
diff --git a/tests/resources/merge-resolve.git/objects/05/f3c1a2a56ca95c3d2ef28dc9ddf32b5cd6c91c b/tests/resources/merge-resolve.git/objects/05/f3c1a2a56ca95c3d2ef28dc9ddf32b5cd6c91c
new file mode 100644
index 0000000..7b4b152
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/05/f3c1a2a56ca95c3d2ef28dc9ddf32b5cd6c91c differ
diff --git a/tests/resources/merge-resolve.git/objects/07/a759da919f737221791d542f176ab49c88837f b/tests/resources/merge-resolve.git/objects/07/a759da919f737221791d542f176ab49c88837f
new file mode 100644
index 0000000..a34b6c2
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/07/a759da919f737221791d542f176ab49c88837f differ
diff --git a/tests/resources/merge-resolve.git/objects/07/c514b04698e068892b31c8d352b85813b99c6e b/tests/resources/merge-resolve.git/objects/07/c514b04698e068892b31c8d352b85813b99c6e
new file mode 100644
index 0000000..23ab921
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/07/c514b04698e068892b31c8d352b85813b99c6e differ
diff --git a/tests/resources/merge-resolve.git/objects/09/055301463b7f2f8ee5d368f8ed5c0a40ad8515 b/tests/resources/merge-resolve.git/objects/09/055301463b7f2f8ee5d368f8ed5c0a40ad8515
new file mode 100644
index 0000000..bf5b0fc
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/09/055301463b7f2f8ee5d368f8ed5c0a40ad8515 differ
diff --git a/tests/resources/merge-resolve.git/objects/09/17bb159596aea4d295f4857da77e8f96b3c7dc b/tests/resources/merge-resolve.git/objects/09/17bb159596aea4d295f4857da77e8f96b3c7dc
new file mode 100644
index 0000000..9fb640d
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/09/17bb159596aea4d295f4857da77e8f96b3c7dc differ
diff --git a/tests/resources/merge-resolve.git/objects/09/2ce8682d7f3a2a3a769a6daca58950168ba5c4 b/tests/resources/merge-resolve.git/objects/09/2ce8682d7f3a2a3a769a6daca58950168ba5c4
new file mode 100644
index 0000000..b709cf4
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/09/2ce8682d7f3a2a3a769a6daca58950168ba5c4 differ
diff --git a/tests/resources/merge-resolve.git/objects/09/3bebf072dd4bbba88833667d6ffe454df199e1 b/tests/resources/merge-resolve.git/objects/09/3bebf072dd4bbba88833667d6ffe454df199e1
new file mode 100644
index 0000000..ae13207
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/09/3bebf072dd4bbba88833667d6ffe454df199e1 differ
diff --git a/tests/resources/merge-resolve.git/objects/09/768bed22680cdb0859683fa9677ccc8d5a25c1 b/tests/resources/merge-resolve.git/objects/09/768bed22680cdb0859683fa9677ccc8d5a25c1
new file mode 100644
index 0000000..5f4b4da
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/09/768bed22680cdb0859683fa9677ccc8d5a25c1 differ
diff --git a/tests/resources/merge-resolve.git/objects/0a/75d9aac1dc84fb5aa51f7325c0ab53242ddef7 b/tests/resources/merge-resolve.git/objects/0a/75d9aac1dc84fb5aa51f7325c0ab53242ddef7
new file mode 100644
index 0000000..d537734
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/0a/75d9aac1dc84fb5aa51f7325c0ab53242ddef7 differ
diff --git a/tests/resources/merge-resolve.git/objects/0c/fd6c54ef6532d862408f562309dc9c74a401e8 b/tests/resources/merge-resolve.git/objects/0c/fd6c54ef6532d862408f562309dc9c74a401e8
new file mode 100644
index 0000000..40f628f
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/0c/fd6c54ef6532d862408f562309dc9c74a401e8 differ
diff --git a/tests/resources/merge-resolve.git/objects/0d/52e3a556e189ba0948ae56780918011c1b167d b/tests/resources/merge-resolve.git/objects/0d/52e3a556e189ba0948ae56780918011c1b167d
new file mode 100644
index 0000000..4b633e5
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/0d/52e3a556e189ba0948ae56780918011c1b167d differ
diff --git a/tests/resources/merge-resolve.git/objects/0d/872f8e871a30208305978ecbf9e66d864f1638 b/tests/resources/merge-resolve.git/objects/0d/872f8e871a30208305978ecbf9e66d864f1638
new file mode 100644
index 0000000..4cbc18e
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/0d/872f8e871a30208305978ecbf9e66d864f1638 differ
diff --git a/tests/resources/merge-resolve.git/objects/0e/c5f433959cd46177f745903353efb5be08d151 b/tests/resources/merge-resolve.git/objects/0e/c5f433959cd46177f745903353efb5be08d151
new file mode 100644
index 0000000..1bee56c
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/0e/c5f433959cd46177f745903353efb5be08d151 differ
diff --git a/tests/resources/merge-resolve.git/objects/0f/3fc5dddc8964b9ac1040d0e957f9eb02d9efb3 b/tests/resources/merge-resolve.git/objects/0f/3fc5dddc8964b9ac1040d0e957f9eb02d9efb3
new file mode 100644
index 0000000..d0ca42d
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/0f/3fc5dddc8964b9ac1040d0e957f9eb02d9efb3 differ
diff --git a/tests/resources/merge-resolve.git/objects/11/aeee27ac45a8402c2fd5b875d66dd844e5df00 b/tests/resources/merge-resolve.git/objects/11/aeee27ac45a8402c2fd5b875d66dd844e5df00
new file mode 100644
index 0000000..90e729f
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/11/aeee27ac45a8402c2fd5b875d66dd844e5df00 differ
diff --git a/tests/resources/merge-resolve.git/objects/11/deab00b2d3a6f5a3073988ac050c2d7b6655e2 b/tests/resources/merge-resolve.git/objects/11/deab00b2d3a6f5a3073988ac050c2d7b6655e2
new file mode 100644
index 0000000..857b236
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/11/deab00b2d3a6f5a3073988ac050c2d7b6655e2 differ
diff --git a/tests/resources/merge-resolve.git/objects/11/f4f3c08b737f5fd896cbefa1425ee63b21b2fa b/tests/resources/merge-resolve.git/objects/11/f4f3c08b737f5fd896cbefa1425ee63b21b2fa
new file mode 100644
index 0000000..6555194
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/11/f4f3c08b737f5fd896cbefa1425ee63b21b2fa
@@ -0,0 +1 @@
+x¥ŽQ Dýæ\ fw)cüñ^` Û´‰-Q¯/oàßÌ›Ìdb^×¥j²´«EDC²$†u‚>Œ ¡÷,Ö
z@Œ8¢’ºq‘jk<Ù©GŽ>¹ Òz2Lva2)¸VeÅ:ç¢ÏéÅ%éËœ×{ÞôAý¨“|ƒŸÛǼ 5K@ˆº mg«ü9£jYž _;„n,¼ÅY½y²P”
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/13/d1be4ea52a6ced1d7a1d832f0ee3c399348e5e b/tests/resources/merge-resolve.git/objects/13/d1be4ea52a6ced1d7a1d832f0ee3c399348e5e
new file mode 100644
index 0000000..4e4e175
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/13/d1be4ea52a6ced1d7a1d832f0ee3c399348e5e differ
diff --git a/tests/resources/merge-resolve.git/objects/14/39088f509b79b1535b64193137d3ce4b240734 b/tests/resources/merge-resolve.git/objects/14/39088f509b79b1535b64193137d3ce4b240734
new file mode 100644
index 0000000..51ddf6d
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/14/39088f509b79b1535b64193137d3ce4b240734 differ
diff --git a/tests/resources/merge-resolve.git/objects/15/8dc7bedb202f5b26502bf3574faa7f4238d56c b/tests/resources/merge-resolve.git/objects/15/8dc7bedb202f5b26502bf3574faa7f4238d56c
new file mode 100644
index 0000000..064423d
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/15/8dc7bedb202f5b26502bf3574faa7f4238d56c
@@ -0,0 +1,2 @@
+x¥ŽK!D]sŠ¾€¦ùCbŒoà i2. b¼¾£ñîªÞK*E½µÛep73UƒÓ¾*NYYôI²Ô”)–j¼ŠL:8§<‹{¼NˆÞ“‹ÎÊH6iDC¶Ê"mqH!–Ì9T¥mé9—>àR^i¸.½=ú
+GÞè'ù+~í@½@j+ƒ7ÑØ£EÝÎNþsFtš]‰7bN)
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/16/f825815cfd20a07a75c71554e82d8eede0b061 b/tests/resources/merge-resolve.git/objects/16/f825815cfd20a07a75c71554e82d8eede0b061
new file mode 100644
index 0000000..82d6525
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/16/f825815cfd20a07a75c71554e82d8eede0b061
@@ -0,0 +1 @@
+x¥ŽK!D]sŠ¾€†šObŒoà Œ ƒ¯ïh¼»ª÷’Jqoí6A¹›£°JÙ€ˆ¬“T1h¢3§£·Î'LÕ ó.‰{ eœc,a`ŠZJÃT1#e+Ù‡œJòUiª">çÒ\ò+Ž ×¥·G_áX6úIçò¿vàÞN€šÐ;ÈÀ^’”b£ÛÙYþœgGñ—MMµ
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/17/8940b450f238a56c0d75b7955cb57b38191982 b/tests/resources/merge-resolve.git/objects/17/8940b450f238a56c0d75b7955cb57b38191982
new file mode 100644
index 0000000..94e571e
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/17/8940b450f238a56c0d75b7955cb57b38191982 differ
diff --git a/tests/resources/merge-resolve.git/objects/18/3310e30fb1499af8c619108ffea4d300b5e778 b/tests/resources/merge-resolve.git/objects/18/3310e30fb1499af8c619108ffea4d300b5e778
new file mode 100644
index 0000000..1c4010d
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/18/3310e30fb1499af8c619108ffea4d300b5e778 differ
diff --git a/tests/resources/merge-resolve.git/objects/18/cb316b1cefa0f8a6946f0e201a8e1a6f845ab9 b/tests/resources/merge-resolve.git/objects/18/cb316b1cefa0f8a6946f0e201a8e1a6f845ab9
new file mode 100644
index 0000000..30f3110
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/18/cb316b1cefa0f8a6946f0e201a8e1a6f845ab9 differ
diff --git a/tests/resources/merge-resolve.git/objects/19/b7ac485269b672a101060894de3ba9c2a24dd1 b/tests/resources/merge-resolve.git/objects/19/b7ac485269b672a101060894de3ba9c2a24dd1
new file mode 100644
index 0000000..e34ccb8
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/19/b7ac485269b672a101060894de3ba9c2a24dd1 differ
diff --git a/tests/resources/merge-resolve.git/objects/1a/010b1c0f081b2e8901d55307a15c29ff30af0e b/tests/resources/merge-resolve.git/objects/1a/010b1c0f081b2e8901d55307a15c29ff30af0e
new file mode 100644
index 0000000..6039df0
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/1a/010b1c0f081b2e8901d55307a15c29ff30af0e differ
diff --git a/tests/resources/merge-resolve.git/objects/1c/51d885170f57a0c4e8c69ff6363d91a5b51f85 b/tests/resources/merge-resolve.git/objects/1c/51d885170f57a0c4e8c69ff6363d91a5b51f85
new file mode 100644
index 0000000..9a21e26
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/1c/51d885170f57a0c4e8c69ff6363d91a5b51f85 differ
diff --git a/tests/resources/merge-resolve.git/objects/1c/ff9ec6a47a537380dedfdd17c9e76d74259a2b b/tests/resources/merge-resolve.git/objects/1c/ff9ec6a47a537380dedfdd17c9e76d74259a2b
new file mode 100644
index 0000000..30802bc
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/1c/ff9ec6a47a537380dedfdd17c9e76d74259a2b differ
diff --git a/tests/resources/merge-resolve.git/objects/1e/4ff029aee68d0d69ef9eb6efa6cbf1ec732f99 b/tests/resources/merge-resolve.git/objects/1e/4ff029aee68d0d69ef9eb6efa6cbf1ec732f99
new file mode 100644
index 0000000..5183b83
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/1e/4ff029aee68d0d69ef9eb6efa6cbf1ec732f99 differ
diff --git a/tests/resources/merge-resolve.git/objects/1f/81433e3161efbf250576c58fede7f6b836f3d3 b/tests/resources/merge-resolve.git/objects/1f/81433e3161efbf250576c58fede7f6b836f3d3
new file mode 100644
index 0000000..9708556
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/1f/81433e3161efbf250576c58fede7f6b836f3d3 differ
diff --git a/tests/resources/merge-resolve.git/objects/20/91d94c8bd3eb0835dc5220de5e8bb310fa1513 b/tests/resources/merge-resolve.git/objects/20/91d94c8bd3eb0835dc5220de5e8bb310fa1513
new file mode 100644
index 0000000..a843890
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/20/91d94c8bd3eb0835dc5220de5e8bb310fa1513 differ
diff --git a/tests/resources/merge-resolve.git/objects/21/671e290278286fb2ce4c63d01699b67adce331 b/tests/resources/merge-resolve.git/objects/21/671e290278286fb2ce4c63d01699b67adce331
new file mode 100644
index 0000000..b656d00
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/21/671e290278286fb2ce4c63d01699b67adce331 differ
diff --git a/tests/resources/merge-resolve.git/objects/22/7792b52aaa0b238bea00ec7e509b02623f168c b/tests/resources/merge-resolve.git/objects/22/7792b52aaa0b238bea00ec7e509b02623f168c
new file mode 100644
index 0000000..3bb19bb
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/22/7792b52aaa0b238bea00ec7e509b02623f168c differ
diff --git a/tests/resources/merge-resolve.git/objects/23/3c0919c998ed110a4b6ff36f353aec8b713487 b/tests/resources/merge-resolve.git/objects/23/3c0919c998ed110a4b6ff36f353aec8b713487
new file mode 100644
index 0000000..d0c8c9e
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/23/3c0919c998ed110a4b6ff36f353aec8b713487 differ
diff --git a/tests/resources/merge-resolve.git/objects/23/92a2dacc9efb562b8635d6579fb458751c7c5b b/tests/resources/merge-resolve.git/objects/23/92a2dacc9efb562b8635d6579fb458751c7c5b
new file mode 100644
index 0000000..86127a3
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/23/92a2dacc9efb562b8635d6579fb458751c7c5b differ
diff --git a/tests/resources/merge-resolve.git/objects/23/ed141a6ae1e798b2f721afedbe947c119111ba b/tests/resources/merge-resolve.git/objects/23/ed141a6ae1e798b2f721afedbe947c119111ba
new file mode 100644
index 0000000..06dee3b
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/23/ed141a6ae1e798b2f721afedbe947c119111ba differ
diff --git a/tests/resources/merge-resolve.git/objects/24/1a1005cd9b980732741b74385b891142bcba28 b/tests/resources/merge-resolve.git/objects/24/1a1005cd9b980732741b74385b891142bcba28
new file mode 100644
index 0000000..9b65f66
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/24/1a1005cd9b980732741b74385b891142bcba28 differ
diff --git a/tests/resources/merge-resolve.git/objects/24/2591eb280ee9eeb2ce63524b9a8b9bc4cb515d b/tests/resources/merge-resolve.git/objects/24/2591eb280ee9eeb2ce63524b9a8b9bc4cb515d
new file mode 100644
index 0000000..74a0137
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/24/2591eb280ee9eeb2ce63524b9a8b9bc4cb515d differ
diff --git a/tests/resources/merge-resolve.git/objects/24/90b9f1a079420870027deefb49f51d6656cf74 b/tests/resources/merge-resolve.git/objects/24/90b9f1a079420870027deefb49f51d6656cf74
new file mode 100644
index 0000000..60497ca
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/24/90b9f1a079420870027deefb49f51d6656cf74 differ
diff --git a/tests/resources/merge-resolve.git/objects/25/9d08ca43af9200e9ea9a098e44a5a350ebd9b3 b/tests/resources/merge-resolve.git/objects/25/9d08ca43af9200e9ea9a098e44a5a350ebd9b3
new file mode 100644
index 0000000..2bae669
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/25/9d08ca43af9200e9ea9a098e44a5a350ebd9b3 differ
diff --git a/tests/resources/merge-resolve.git/objects/25/c40b7660c08c8fb581f770312f41b9b03119d1 b/tests/resources/merge-resolve.git/objects/25/c40b7660c08c8fb581f770312f41b9b03119d1
new file mode 100644
index 0000000..1852147
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/25/c40b7660c08c8fb581f770312f41b9b03119d1 differ
diff --git a/tests/resources/merge-resolve.git/objects/26/153a3ff3649b6c2bb652d3f06878c6e0a172f9 b/tests/resources/merge-resolve.git/objects/26/153a3ff3649b6c2bb652d3f06878c6e0a172f9
new file mode 100644
index 0000000..4fcaa07
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/26/153a3ff3649b6c2bb652d3f06878c6e0a172f9 differ
diff --git a/tests/resources/merge-resolve.git/objects/27/133da702ba3c60af2a01e96c2555ff4045d692 b/tests/resources/merge-resolve.git/objects/27/133da702ba3c60af2a01e96c2555ff4045d692
new file mode 100644
index 0000000..08e61f8
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/27/133da702ba3c60af2a01e96c2555ff4045d692 differ
diff --git a/tests/resources/merge-resolve.git/objects/27/4bbe983022fb4c02f8a2bf2ebe8da4fe130054 b/tests/resources/merge-resolve.git/objects/27/4bbe983022fb4c02f8a2bf2ebe8da4fe130054
new file mode 100644
index 0000000..c7afad2
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/27/4bbe983022fb4c02f8a2bf2ebe8da4fe130054 differ
diff --git a/tests/resources/merge-resolve.git/objects/2a/f2d9bcbc73723ac988bb202d4397f72a6ca7a0 b/tests/resources/merge-resolve.git/objects/2a/f2d9bcbc73723ac988bb202d4397f72a6ca7a0
new file mode 100644
index 0000000..0d65823
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/2a/f2d9bcbc73723ac988bb202d4397f72a6ca7a0 differ
diff --git a/tests/resources/merge-resolve.git/objects/2b/0de5dc27505dcdd83a75c8bf1fcd9462cd7add b/tests/resources/merge-resolve.git/objects/2b/0de5dc27505dcdd83a75c8bf1fcd9462cd7add
new file mode 100644
index 0000000..a95f926
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/2b/0de5dc27505dcdd83a75c8bf1fcd9462cd7add differ
diff --git a/tests/resources/merge-resolve.git/objects/2b/5f1f181ee3b58ea751f5dd5d8f9b445520a136 b/tests/resources/merge-resolve.git/objects/2b/5f1f181ee3b58ea751f5dd5d8f9b445520a136
new file mode 100644
index 0000000..d24231e
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/2b/5f1f181ee3b58ea751f5dd5d8f9b445520a136 differ
diff --git a/tests/resources/merge-resolve.git/objects/2b/d0a343aeef7a2cf0d158478966a6e587ff3863 b/tests/resources/merge-resolve.git/objects/2b/d0a343aeef7a2cf0d158478966a6e587ff3863
new file mode 100644
index 0000000..d10ca63
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/2b/d0a343aeef7a2cf0d158478966a6e587ff3863 differ
diff --git a/tests/resources/merge-resolve.git/objects/2b/fdd7e1b6c6ae993f23dfe8e84a8e06a772fa2a b/tests/resources/merge-resolve.git/objects/2b/fdd7e1b6c6ae993f23dfe8e84a8e06a772fa2a
new file mode 100644
index 0000000..c86edfb
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/2b/fdd7e1b6c6ae993f23dfe8e84a8e06a772fa2a differ
diff --git a/tests/resources/merge-resolve.git/objects/2d/a538570bc1e5b2c3e855bf702f35248ad0735f b/tests/resources/merge-resolve.git/objects/2d/a538570bc1e5b2c3e855bf702f35248ad0735f
new file mode 100644
index 0000000..83253f8
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/2d/a538570bc1e5b2c3e855bf702f35248ad0735f
@@ -0,0 +1,2 @@
+x¥ŽK
+1D]ç¹€ÒùN"n¼{ét:Œ‹L$ñúŽâ
ÜU½EQ«õ>¤¶~7:³L
ðÙD [´±5—¬É‡, Øy2e®ÐTت@”¦z*.û(ë´Àç˜[——üžåunum‹<òF?éÌ_ñkjõ$•qNå'#÷àÄF·³ƒÿœ¹Üp!^Gëâ
9+Q.
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/2f/2e37b7ebbae467978610896ca3aafcdad2ee67 b/tests/resources/merge-resolve.git/objects/2f/2e37b7ebbae467978610896ca3aafcdad2ee67
new file mode 100644
index 0000000..7adffb1
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/2f/2e37b7ebbae467978610896ca3aafcdad2ee67 differ
diff --git a/tests/resources/merge-resolve.git/objects/2f/4024ce528d36d8670c289cce5a7963e625bb0c b/tests/resources/merge-resolve.git/objects/2f/4024ce528d36d8670c289cce5a7963e625bb0c
new file mode 100644
index 0000000..0100fd7
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/2f/4024ce528d36d8670c289cce5a7963e625bb0c differ
diff --git a/tests/resources/merge-resolve.git/objects/2f/56120107d680129a5d9791b521cb1e73a2ed31 b/tests/resources/merge-resolve.git/objects/2f/56120107d680129a5d9791b521cb1e73a2ed31
new file mode 100644
index 0000000..1f5f597
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/2f/56120107d680129a5d9791b521cb1e73a2ed31
@@ -0,0 +1,3 @@
+xí[
+Â@ EýžUdR臸žy¤öBÌ”LJ·oÔnBð/pî#Ü"½Ðí>_|Å Ât@„
+“ñapg%hò•aãJYÁÕ®Aâ8Õ©í› fçಠûN©ì ¦¯4À;œ”h[º%cÍO¦ÆÎÕÑuJÑ÷çWÖyÎ
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/2f/598248eeccfc27e5ca44d9d96383f6dfea7b16 b/tests/resources/merge-resolve.git/objects/2f/598248eeccfc27e5ca44d9d96383f6dfea7b16
new file mode 100644
index 0000000..1d9f226
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/2f/598248eeccfc27e5ca44d9d96383f6dfea7b16
@@ -0,0 +1 @@
+x+)JMU067c040031QH,-ÉÏM-JOMLÊIÕ+©(aH:,»:ÎCÉýúô:ÞË ²o>ZC'g$楧¦èfæé&%æ%g€5¬ÎqYôÂeÒZoÇÝÙkÚMíæ2éÆÔ›X\’ZDPC~^ZNfrIf^:Xéõ› ZHÙŠž1O(_œ,'º×
jvQjn~Ä1–ÈÎÑ×3ßþzדôém9‹Wý¹ué]:¦$÷ßüI{•|þ¹÷ 2m» gÜ˾‹©Éý1ÖËåüŠ5Ó¿Ü ,\“µ})TC)0PÀavý‰ùzÖ›¦9–¤×Mü°úÕ…'6óbˆ—¢
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/31/68dca1a561889b045a6441909f4c56145e666d b/tests/resources/merge-resolve.git/objects/31/68dca1a561889b045a6441909f4c56145e666d
new file mode 100644
index 0000000..2de1c5a
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/31/68dca1a561889b045a6441909f4c56145e666d
@@ -0,0 +1,2 @@
+x¥ŽQ
+Â0DýÎ)rJ²›MñÇxM²¥ÛHŒz}«xÿfÞƒaRY–¹ip´kUD $Ï1f¢Q2qê-Ó=Y £ëÁ3R7®²6äÄ¡·Œgàâ9e7 bæ¡w ‚âG›JÕçüâšõe*˽¬ú ý¤“|ůíSYŽÚ"5&Ðñƨng›ü9£ZŸ3_;kÕ¬dO¼
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/31/d5472536041a83d986829240bbbdc897c6f8a6 b/tests/resources/merge-resolve.git/objects/31/d5472536041a83d986829240bbbdc897c6f8a6
new file mode 100644
index 0000000..5ec5acb
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/31/d5472536041a83d986829240bbbdc897c6f8a6 differ
diff --git a/tests/resources/merge-resolve.git/objects/32/21dd512b7e2dc4b5bd03046df6c81b2ab2070b b/tests/resources/merge-resolve.git/objects/32/21dd512b7e2dc4b5bd03046df6c81b2ab2070b
new file mode 100644
index 0000000..d36138d
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/32/21dd512b7e2dc4b5bd03046df6c81b2ab2070b differ
diff --git a/tests/resources/merge-resolve.git/objects/33/46d64325b39e5323733492cd55f808994a2475 b/tests/resources/merge-resolve.git/objects/33/46d64325b39e5323733492cd55f808994a2475
new file mode 100644
index 0000000..11546ce
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/33/46d64325b39e5323733492cd55f808994a2475 differ
diff --git a/tests/resources/merge-resolve.git/objects/33/d500f588fbbe65901d82b4e6b008e549064be0 b/tests/resources/merge-resolve.git/objects/33/d500f588fbbe65901d82b4e6b008e549064be0
new file mode 100644
index 0000000..061a031
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/33/d500f588fbbe65901d82b4e6b008e549064be0
@@ -0,0 +1,2 @@
+x¥ŽA E]s
+. hbŒoত.Z Åx}[ã
Üýÿ~òó¤Îó£këü¡·œµCAŒž<:km`d”„Ì‘d,!:𦳤žÜòÒõ‚øÁ“„œP1ÉPò qHc c±HEñ«Oµé[zsKú>Õy‹>çî隿ï¤ÎmŒŠú 6ºÉöüç*¼öRÛn¢>úåOÇ
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/34/8dcd41e2b467991578e92bedd16971b877ef1e b/tests/resources/merge-resolve.git/objects/34/8dcd41e2b467991578e92bedd16971b877ef1e
new file mode 100644
index 0000000..fd61b6c
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/34/8dcd41e2b467991578e92bedd16971b877ef1e differ
diff --git a/tests/resources/merge-resolve.git/objects/34/bfafff88eaf118402b44e6f3e2dbbf1a582b05 b/tests/resources/merge-resolve.git/objects/34/bfafff88eaf118402b44e6f3e2dbbf1a582b05
new file mode 100644
index 0000000..c653cec
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/34/bfafff88eaf118402b44e6f3e2dbbf1a582b05
@@ -0,0 +1 @@
+x•ŽKj1D½Ö)ú úµ>`Œ7¾A. µ$<`MŒ¯orlŠ¢ ¸÷m‚¶þ4G›·&údVdƒ[j2ÖµËJÉâ›C«ÑŠgu_GuÒ%ÅÚ2:ƒ3X úزÅàQ‘'Ì"½æÜÊ;?wîïp®kým×¾ÑàƒÛü&îPf!¢ ð%QJ±Ö%:ëûCˆeœzâ½=6šÀ¯qˆ;iOè
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/35/0c6eb3010efc403a6bed682332635314e9ed58 b/tests/resources/merge-resolve.git/objects/35/0c6eb3010efc403a6bed682332635314e9ed58
new file mode 100644
index 0000000..2eee602
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/35/0c6eb3010efc403a6bed682332635314e9ed58 differ
diff --git a/tests/resources/merge-resolve.git/objects/35/411bfb77cd2cc431f3a03a2b4976ed94b5d241 b/tests/resources/merge-resolve.git/objects/35/411bfb77cd2cc431f3a03a2b4976ed94b5d241
new file mode 100644
index 0000000..ea024cc
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/35/411bfb77cd2cc431f3a03a2b4976ed94b5d241 differ
diff --git a/tests/resources/merge-resolve.git/objects/35/4704d3613ad4228e4786fc76656b11e98236c4 b/tests/resources/merge-resolve.git/objects/35/4704d3613ad4228e4786fc76656b11e98236c4
new file mode 100644
index 0000000..1dd13c4
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/35/4704d3613ad4228e4786fc76656b11e98236c4 differ
diff --git a/tests/resources/merge-resolve.git/objects/35/632e43612c06a3ea924bfbacd48333da874c29 b/tests/resources/merge-resolve.git/objects/35/632e43612c06a3ea924bfbacd48333da874c29
new file mode 100644
index 0000000..be7684f
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/35/632e43612c06a3ea924bfbacd48333da874c29
@@ -0,0 +1 @@
+x¥NË
!õLÓÀšd–MŒñb60ÀÝă¨í‹Æ¼½^,ëº40;·iUFf+)›³ˆ1vòBÁ939fG–(ôD IݸʵA$ s´è½k]’l|Lä{IgŠ™Ñ$‰Š m.NéÅ5Áy.ë½\a/]ý £| ÛƲ @[g4âä< Hˆª«ýl“?gT«ËsáË µzCøP˜
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/35/75826c96a975031d2c14368529cc5c4353a8fd b/tests/resources/merge-resolve.git/objects/35/75826c96a975031d2c14368529cc5c4353a8fd
new file mode 100644
index 0000000..24e33bc
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/35/75826c96a975031d2c14368529cc5c4353a8fd differ
diff --git a/tests/resources/merge-resolve.git/objects/36/219b49367146cb2e6a1555b5a9ebd4d0328495 b/tests/resources/merge-resolve.git/objects/36/219b49367146cb2e6a1555b5a9ebd4d0328495
new file mode 100644
index 0000000..7f80443
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/36/219b49367146cb2e6a1555b5a9ebd4d0328495 differ
diff --git a/tests/resources/merge-resolve.git/objects/36/4bbe4ce80c7bd31e6307dce77d46e3e1759fb3 b/tests/resources/merge-resolve.git/objects/36/4bbe4ce80c7bd31e6307dce77d46e3e1759fb3
new file mode 100644
index 0000000..90fd965
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/36/4bbe4ce80c7bd31e6307dce77d46e3e1759fb3 differ
diff --git a/tests/resources/merge-resolve.git/objects/37/48859b001c6e627e712a07951aee40afd19b41 b/tests/resources/merge-resolve.git/objects/37/48859b001c6e627e712a07951aee40afd19b41
new file mode 100644
index 0000000..6a0c389
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/37/48859b001c6e627e712a07951aee40afd19b41 differ
diff --git a/tests/resources/merge-resolve.git/objects/37/f53a5a14f64e91089a39ea58e71c87d81df765 b/tests/resources/merge-resolve.git/objects/37/f53a5a14f64e91089a39ea58e71c87d81df765
new file mode 100644
index 0000000..95327ed
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/37/f53a5a14f64e91089a39ea58e71c87d81df765
@@ -0,0 +1 @@
+x•ŽAjC1 D»ö)´Ù‘e}%zƒ^Àß–ã,þwp rý: tVÃÀ›™Ô¶í6À ÃÇèªÀRBB‡Lh—,‹ª·9„À+‹%r¹Ç®û€h1¨•è¥ %£p’"Åæ”=¥ÙâIue £¶ßù{†ŸÚ¶ß¶ÃIgúrçëmÔÇú™Úö–„ÙÏ-œ23/‡þ“'|óæRã~U˜‹k{ªæ£dJï
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/38/5c8a0f26ddf79e9041e15e17dc352ed2c4cced b/tests/resources/merge-resolve.git/objects/38/5c8a0f26ddf79e9041e15e17dc352ed2c4cced
new file mode 100644
index 0000000..e95ff3a
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/38/5c8a0f26ddf79e9041e15e17dc352ed2c4cced
@@ -0,0 +1,2 @@
+x-MK
+1 uS¼YÍRÄ…ñ™6C±…6Ò뛪ð¼okn÷ÇåYt àEpª iÅ DûØCd§Éœ³dLõB+8ø%¨q‚±ƒk µÿú+Þe™Þ6¢ï‡©fHü Bü·¯1J©ÕÓ4ùF à1l
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/3b/47b031b3e55ae11e14a05260b1c3ffd6838d55 b/tests/resources/merge-resolve.git/objects/3b/47b031b3e55ae11e14a05260b1c3ffd6838d55
new file mode 100644
index 0000000..8208646
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/3b/47b031b3e55ae11e14a05260b1c3ffd6838d55 differ
diff --git a/tests/resources/merge-resolve.git/objects/3b/bf0bf59b20df5d5fc58b9fc1dc07be637c301f b/tests/resources/merge-resolve.git/objects/3b/bf0bf59b20df5d5fc58b9fc1dc07be637c301f
new file mode 100644
index 0000000..723a9ae
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/3b/bf0bf59b20df5d5fc58b9fc1dc07be637c301f differ
diff --git a/tests/resources/merge-resolve.git/objects/3e/f4d30382ca33fdeba9fda895a99e0891ba37aa b/tests/resources/merge-resolve.git/objects/3e/f4d30382ca33fdeba9fda895a99e0891ba37aa
new file mode 100644
index 0000000..49ee152
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/3e/f4d30382ca33fdeba9fda895a99e0891ba37aa differ
diff --git a/tests/resources/merge-resolve.git/objects/3e/f9bfe82f9635518ae89152322f3b46fd4ba25b b/tests/resources/merge-resolve.git/objects/3e/f9bfe82f9635518ae89152322f3b46fd4ba25b
new file mode 100644
index 0000000..3b5998c
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/3e/f9bfe82f9635518ae89152322f3b46fd4ba25b differ
diff --git a/tests/resources/merge-resolve.git/objects/40/2784a46a4a3982294231594cbeb431f506d22c b/tests/resources/merge-resolve.git/objects/40/2784a46a4a3982294231594cbeb431f506d22c
new file mode 100644
index 0000000..a17e05d
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/40/2784a46a4a3982294231594cbeb431f506d22c differ
diff --git a/tests/resources/merge-resolve.git/objects/41/2b32fb66137366147f1801ecc962452757d48a b/tests/resources/merge-resolve.git/objects/41/2b32fb66137366147f1801ecc962452757d48a
new file mode 100644
index 0000000..b183dd7
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/41/2b32fb66137366147f1801ecc962452757d48a
@@ -0,0 +1,2 @@
+x¥ŽK
+1D]ç¹€ÒIO>"n¼èt:Œ‹™‰x}£xwU¯ xÜj½um'»ë«ˆ.®Ì9»=y 6Ø$@T8ÌÀ‰&Lhf4êA«Ü»f¡0BŒ(ˆ.K±‘³>9S<›À +zö¥ú’_´f}]ZÝÚ] eÐO:Ëwøµ·zÒ š†‹ÞƒPƒÙ.Þ¨aNU6õ ÎOÖ
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/42/18670ab81cc219a9f94befb5c5dad90ec52648 b/tests/resources/merge-resolve.git/objects/42/18670ab81cc219a9f94befb5c5dad90ec52648
new file mode 100644
index 0000000..33ead61
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/42/18670ab81cc219a9f94befb5c5dad90ec52648 differ
diff --git a/tests/resources/merge-resolve.git/objects/43/aafd43bea779ec74317dc361f45ae3f532a505 b/tests/resources/merge-resolve.git/objects/43/aafd43bea779ec74317dc361f45ae3f532a505
new file mode 100644
index 0000000..ac86823
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/43/aafd43bea779ec74317dc361f45ae3f532a505 differ
diff --git a/tests/resources/merge-resolve.git/objects/43/c338656342227a3a3cd3aa85cbf784061f5425 b/tests/resources/merge-resolve.git/objects/43/c338656342227a3a3cd3aa85cbf784061f5425
new file mode 100644
index 0000000..d977311
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/43/c338656342227a3a3cd3aa85cbf784061f5425 differ
diff --git a/tests/resources/merge-resolve.git/objects/45/299c1ca5e07bba1fd90843056fb559f96b1f5a b/tests/resources/merge-resolve.git/objects/45/299c1ca5e07bba1fd90843056fb559f96b1f5a
new file mode 100644
index 0000000..2093b44
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/45/299c1ca5e07bba1fd90843056fb559f96b1f5a differ
diff --git a/tests/resources/merge-resolve.git/objects/46/6daf8552b891e5c22bc58c9d7fc1a2eb8f0289 b/tests/resources/merge-resolve.git/objects/46/6daf8552b891e5c22bc58c9d7fc1a2eb8f0289
new file mode 100644
index 0000000..c39b53a
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/46/6daf8552b891e5c22bc58c9d7fc1a2eb8f0289 differ
diff --git a/tests/resources/merge-resolve.git/objects/47/6dbb3e207313d1d8aaa120c6ad204bf1295e53 b/tests/resources/merge-resolve.git/objects/47/6dbb3e207313d1d8aaa120c6ad204bf1295e53
new file mode 100644
index 0000000..3e5f66e
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/47/6dbb3e207313d1d8aaa120c6ad204bf1295e53 differ
diff --git a/tests/resources/merge-resolve.git/objects/47/8172cb2f5ff9b514bc9d04d3bd5ef5840cb3b2 b/tests/resources/merge-resolve.git/objects/47/8172cb2f5ff9b514bc9d04d3bd5ef5840cb3b2
new file mode 100644
index 0000000..d9e250e
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/47/8172cb2f5ff9b514bc9d04d3bd5ef5840cb3b2 differ
diff --git a/tests/resources/merge-resolve.git/objects/49/130a28ef567af9a6a6104c38773fedfa5f9742 b/tests/resources/merge-resolve.git/objects/49/130a28ef567af9a6a6104c38773fedfa5f9742
new file mode 100644
index 0000000..e2c49f5
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/49/130a28ef567af9a6a6104c38773fedfa5f9742 differ
diff --git a/tests/resources/merge-resolve.git/objects/49/9df817155e4bdd3c6ee192a72c52f481818230 b/tests/resources/merge-resolve.git/objects/49/9df817155e4bdd3c6ee192a72c52f481818230
new file mode 100644
index 0000000..9c7e471
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/49/9df817155e4bdd3c6ee192a72c52f481818230 differ
diff --git a/tests/resources/merge-resolve.git/objects/49/fd9edac79d15c8fbfca2d481cbb900beba22a6 b/tests/resources/merge-resolve.git/objects/49/fd9edac79d15c8fbfca2d481cbb900beba22a6
new file mode 100644
index 0000000..d808d9f
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/49/fd9edac79d15c8fbfca2d481cbb900beba22a6
@@ -0,0 +1,3 @@
+xUÁ
+Â0D=ç+æ¼èÅ
+‚…þÆf»5dIŽ~¼ÑEhße3Ìó©xœ¯—ÓÍÀ2?ž®‡Ø°Å$Éô%+¢"SëRAºÂWRîm Kýn¸ä\t XZ/µ Ÿhôº¥ÈÝMƱߙìþg2©»ñj >#
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/4a/9550ebcc97ce22b22f45af7b829bb030d003f5 b/tests/resources/merge-resolve.git/objects/4a/9550ebcc97ce22b22f45af7b829bb030d003f5
new file mode 100644
index 0000000..6ec674a
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/4a/9550ebcc97ce22b22f45af7b829bb030d003f5 differ
diff --git a/tests/resources/merge-resolve.git/objects/4b/253da36a0ae8bfce63aeabd8c5b58429925594 b/tests/resources/merge-resolve.git/objects/4b/253da36a0ae8bfce63aeabd8c5b58429925594
new file mode 100644
index 0000000..1a40727
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/4b/253da36a0ae8bfce63aeabd8c5b58429925594
@@ -0,0 +1,2 @@
+x
ÅA
+€0 @ÏûŠ¾AðAILm l¡¦ÿ×¹ŒæÔvGxÑ# ÿ6Ù3¬‚tW BØ6—§”ßÐ%´h”
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/4b/48deed3a433909bfd6b6ab3d4b91348b6af464 b/tests/resources/merge-resolve.git/objects/4b/48deed3a433909bfd6b6ab3d4b91348b6af464
new file mode 100644
index 0000000..328c850
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/4b/48deed3a433909bfd6b6ab3d4b91348b6af464 differ
diff --git a/tests/resources/merge-resolve.git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 b/tests/resources/merge-resolve.git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904
new file mode 100644
index 0000000..adf6411
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/4b/825dc642cb6eb9a060e54bf8d69288fbee4904 differ
diff --git a/tests/resources/merge-resolve.git/objects/4c/9fac0707f8d4195037ae5a681aa48626491541 b/tests/resources/merge-resolve.git/objects/4c/9fac0707f8d4195037ae5a681aa48626491541
new file mode 100644
index 0000000..6b8c85e
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/4c/9fac0707f8d4195037ae5a681aa48626491541 differ
diff --git a/tests/resources/merge-resolve.git/objects/4c/a408a8c88655f7586a1b580be6fad138121e98 b/tests/resources/merge-resolve.git/objects/4c/a408a8c88655f7586a1b580be6fad138121e98
new file mode 100644
index 0000000..15cb7f2
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/4c/a408a8c88655f7586a1b580be6fad138121e98 differ
diff --git a/tests/resources/merge-resolve.git/objects/4d/d1ef7569b18d92d93c0a35bb6b93049137b355 b/tests/resources/merge-resolve.git/objects/4d/d1ef7569b18d92d93c0a35bb6b93049137b355
new file mode 100644
index 0000000..86a21ad
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/4d/d1ef7569b18d92d93c0a35bb6b93049137b355 differ
diff --git a/tests/resources/merge-resolve.git/objects/4e/0d9401aee78eb345a8685a859d37c8c3c0bbed b/tests/resources/merge-resolve.git/objects/4e/0d9401aee78eb345a8685a859d37c8c3c0bbed
new file mode 100644
index 0000000..57f7eb6
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/4e/0d9401aee78eb345a8685a859d37c8c3c0bbed differ
diff --git a/tests/resources/merge-resolve.git/objects/4e/886e602529caa9ab11d71f86634bd1b6e0de10 b/tests/resources/merge-resolve.git/objects/4e/886e602529caa9ab11d71f86634bd1b6e0de10
new file mode 100644
index 0000000..53168a0
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/4e/886e602529caa9ab11d71f86634bd1b6e0de10 differ
diff --git a/tests/resources/merge-resolve.git/objects/4e/b04c9e79e88f6640d01ff5b25ca2a60764f216 b/tests/resources/merge-resolve.git/objects/4e/b04c9e79e88f6640d01ff5b25ca2a60764f216
new file mode 100644
index 0000000..f4ec0ef
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/4e/b04c9e79e88f6640d01ff5b25ca2a60764f216 differ
diff --git a/tests/resources/merge-resolve.git/objects/4f/e93c0ec83eb6305cbace3dace88ecee1b63cb6 b/tests/resources/merge-resolve.git/objects/4f/e93c0ec83eb6305cbace3dace88ecee1b63cb6
new file mode 100644
index 0000000..67dc684
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/4f/e93c0ec83eb6305cbace3dace88ecee1b63cb6 differ
diff --git a/tests/resources/merge-resolve.git/objects/50/12fd565b1393bdfda1805d4ec38ce6619e1fd1 b/tests/resources/merge-resolve.git/objects/50/12fd565b1393bdfda1805d4ec38ce6619e1fd1
new file mode 100644
index 0000000..d629a23
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/50/12fd565b1393bdfda1805d4ec38ce6619e1fd1 differ
diff --git a/tests/resources/merge-resolve.git/objects/50/4f75ac95a71ef98051817618576a68505b92f9 b/tests/resources/merge-resolve.git/objects/50/4f75ac95a71ef98051817618576a68505b92f9
new file mode 100644
index 0000000..1b24c72
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/50/4f75ac95a71ef98051817618576a68505b92f9 differ
diff --git a/tests/resources/merge-resolve.git/objects/50/84fc2a88b6bdba8db93bd3953a8f4fdb470238 b/tests/resources/merge-resolve.git/objects/50/84fc2a88b6bdba8db93bd3953a8f4fdb470238
new file mode 100644
index 0000000..84c9987
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/50/84fc2a88b6bdba8db93bd3953a8f4fdb470238 differ
diff --git a/tests/resources/merge-resolve.git/objects/50/c5dc8cdfe40c688eb0a0e23be54dd57cae2e78 b/tests/resources/merge-resolve.git/objects/50/c5dc8cdfe40c688eb0a0e23be54dd57cae2e78
new file mode 100644
index 0000000..c04baa1
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/50/c5dc8cdfe40c688eb0a0e23be54dd57cae2e78
@@ -0,0 +1,2 @@
+xŽ]
+Â0„}Î)öJ’vó">x/°I6ZhIÓžß*žÀ§a†ïƒ‰eš†ZûC«Ì`‰œF‡6;KL¶O)«.yìÑ8¢N¦ ‡^¼¨òÜ ƒ¡Ç}óa'¤ôÑ° öSØù˜Ù*›²´¶g©p£mHp_ëÌÎsÙh –ë/O¥>. Pi…FúŽ¥ñû±íÂ?¶¨,k˜JZGo»¾JT
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/50/ce7d7d01217679e26c55939eef119e0c93e272 b/tests/resources/merge-resolve.git/objects/50/ce7d7d01217679e26c55939eef119e0c93e272
new file mode 100644
index 0000000..e2f9f67
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/50/ce7d7d01217679e26c55939eef119e0c93e272 differ
diff --git a/tests/resources/merge-resolve.git/objects/51/95a1b480f66691b667f10a9e41e70115a78351 b/tests/resources/merge-resolve.git/objects/51/95a1b480f66691b667f10a9e41e70115a78351
new file mode 100644
index 0000000..088ee54
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/51/95a1b480f66691b667f10a9e41e70115a78351 differ
diff --git a/tests/resources/merge-resolve.git/objects/52/d8bc572af2b6d4ee0d5e62ed5d1fbad92210a9 b/tests/resources/merge-resolve.git/objects/52/d8bc572af2b6d4ee0d5e62ed5d1fbad92210a9
new file mode 100644
index 0000000..6522209
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/52/d8bc572af2b6d4ee0d5e62ed5d1fbad92210a9
@@ -0,0 +1,3 @@
+x¥Ž]
+Â0„}Î)rÊnóÓD|ñ^`“ÝЂm$F½¾U¼o3ßä²,sÓ½Ã]«" #€ÇàÙbÈ"ö1±
9÷<Q7ª²6=8
+ˆ1û˜ÜàGK Mv>²’cTôhS©úÌ/ª¬/SYîeÕÙè'ä+~mŸÊrÔh\c‡QwàÔF·³MþœQÎÏ™®]èb¥5Mê
¨ÚRŸ
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/53/825f41ac8d640612f9423a2f03a69f3d96809a b/tests/resources/merge-resolve.git/objects/53/825f41ac8d640612f9423a2f03a69f3d96809a
new file mode 100644
index 0000000..08cb0b6
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/53/825f41ac8d640612f9423a2f03a69f3d96809a differ
diff --git a/tests/resources/merge-resolve.git/objects/54/269b3f6ec3d7d4ede24dd350dd5d605495c3ae b/tests/resources/merge-resolve.git/objects/54/269b3f6ec3d7d4ede24dd350dd5d605495c3ae
new file mode 100644
index 0000000..4a24153
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/54/269b3f6ec3d7d4ede24dd350dd5d605495c3ae
@@ -0,0 +1,2 @@
+x¥ŽK
+1D]ç¹€ÒI¦ó7ÞÀ LºÓŒ‹L$F¼¾£xwUïAQÔj½
m'Ø^Šv9 dÁ”-° £Æœ„ „\¼ äÀˆºÏ½¬C§È'&Î`"ÃÙÅĹä(Ö¡¨ù9–Öõ…_sg}]Z}´U ËF?é\¾â×ÔêI‡&ëô @mt;;ÊŸ3ªÑh“z“ÎNÀ
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/54/59c89aa0026d543ce8343bd89871bce543f9c2 b/tests/resources/merge-resolve.git/objects/54/59c89aa0026d543ce8343bd89871bce543f9c2
new file mode 100644
index 0000000..178b833
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/54/59c89aa0026d543ce8343bd89871bce543f9c2
@@ -0,0 +1,3 @@
+x¥ŽÑ
!Dý¦
+Ð,,,ã ØÀ ,9O blßÓØ3ï%“ÉmY.C[L›ÑEtd–`\
%aBH%TƒvB G%QphÐqªêÎ]nCg‚P3BŒ(ˆ¾Hµ1Š4yS)W;IVü sëúT^Ü‹>Ïmy´›ÞËJ?é(_ñk»Ü–ƒ6è-$ç#è-€ZézvÈŸ3
+ù:ÔNqMB
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/54/7607c690372fe81fab8e3bb44c530e129118fd b/tests/resources/merge-resolve.git/objects/54/7607c690372fe81fab8e3bb44c530e129118fd
new file mode 100644
index 0000000..dccd220
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/54/7607c690372fe81fab8e3bb44c530e129118fd differ
diff --git a/tests/resources/merge-resolve.git/objects/55/b4e4687e7a0d9ca367016ed930f385d4022e6f b/tests/resources/merge-resolve.git/objects/55/b4e4687e7a0d9ca367016ed930f385d4022e6f
new file mode 100644
index 0000000..fb157a2
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/55/b4e4687e7a0d9ca367016ed930f385d4022e6f
@@ -0,0 +1 @@
+x¥ŽQjÃ0DûíSìZv¥ÕJ‚ú“ä²´Š
µ •\¿Né
ú7ó “û¶Œã·±«‚Ôd-{á¹LìXçÀÖ'ÅŒ
ÊçéžvmŠä*Ù{¦ÙZ’`$U²ÄÈÆ9ÌÑ-T Né{,}‡Ky¦½ÀuéÛ£78éA_éS‡¿ö‘ûv².ÄèEÞQ§ƒ g‡þSsxZýZóXÛ
ò’ÚM ÓNRi
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/56/6ab53c220a2eafc1212af1a024513230280ab9 b/tests/resources/merge-resolve.git/objects/56/6ab53c220a2eafc1212af1a024513230280ab9
new file mode 100644
index 0000000..a8855ae
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/56/6ab53c220a2eafc1212af1a024513230280ab9
@@ -0,0 +1,3 @@
+x¥ŽÑ
!Dý¦
+Ð,˱‰1þØ
,°äLD blßÓØ3ï%“IÖËÐhÃft
Ù¡XvŽÄøÂäY Í ‚ñ`L2ÑМջ܆NsI¼·bËRЧLž¢3…RaÀ$Iñs,ëS~qÏú¼´úh7½—•~ÒQ¾â×v©Õƒ6Ö!œ ê-€ZézvÈŸ3
+ù:Ô9âM&
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/56/a638b76b75e068590ac999c2f8621e7f3e264c b/tests/resources/merge-resolve.git/objects/56/a638b76b75e068590ac999c2f8621e7f3e264c
new file mode 100644
index 0000000..36289bf
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/56/a638b76b75e068590ac999c2f8621e7f3e264c
@@ -0,0 +1 @@
+x¥ŽAj!E³öu vuW©B6sƒ¹€–%ÝÛÁ6äúqÎÝçÁ<iµ p o£«BNŒ¼D'LâJfç „”¸ lŽ<Æ4“yÆ®ç<–Íâ&JèóÊÙ³³‚>È$Ñ^•‘R²bâÏØ[‡{þ=Ãcoõj'|褯õUéíje¼K«Ÿ°¬Ln¡•n–¬5“ÎСÿP˜Y «‚´³| 2`ìzôËü—zQ{
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/57/079a46233ae2b6df62e9ade71c4948512abefb b/tests/resources/merge-resolve.git/objects/57/079a46233ae2b6df62e9ade71c4948512abefb
new file mode 100644
index 0000000..c7eabc4
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/57/079a46233ae2b6df62e9ade71c4948512abefb differ
diff --git a/tests/resources/merge-resolve.git/objects/58/43febcb23480df0b5edb22a21c59c772bb8e29 b/tests/resources/merge-resolve.git/objects/58/43febcb23480df0b5edb22a21c59c772bb8e29
new file mode 100644
index 0000000..f6b2a2b
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/58/43febcb23480df0b5edb22a21c59c772bb8e29 differ
diff --git a/tests/resources/merge-resolve.git/objects/58/87a5e516c53bd58efb0f02ec6aa031b6fe9ad7 b/tests/resources/merge-resolve.git/objects/58/87a5e516c53bd58efb0f02ec6aa031b6fe9ad7
new file mode 100644
index 0000000..550d288
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/58/87a5e516c53bd58efb0f02ec6aa031b6fe9ad7 differ
diff --git a/tests/resources/merge-resolve.git/objects/58/e853f66699fd02629fd50bde08082bc005933a b/tests/resources/merge-resolve.git/objects/58/e853f66699fd02629fd50bde08082bc005933a
new file mode 100644
index 0000000..cf6db63
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/58/e853f66699fd02629fd50bde08082bc005933a differ
diff --git a/tests/resources/merge-resolve.git/objects/59/6803b523203a4851c824c07366906f8353f4ad b/tests/resources/merge-resolve.git/objects/59/6803b523203a4851c824c07366906f8353f4ad
new file mode 100644
index 0000000..cbc8cbe
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/59/6803b523203a4851c824c07366906f8353f4ad differ
diff --git a/tests/resources/merge-resolve.git/objects/5c/2411f8075f48a6b2fdb85ebc0d371747c4df15 b/tests/resources/merge-resolve.git/objects/5c/2411f8075f48a6b2fdb85ebc0d371747c4df15
new file mode 100644
index 0000000..7b41413
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/5c/2411f8075f48a6b2fdb85ebc0d371747c4df15 differ
diff --git a/tests/resources/merge-resolve.git/objects/5c/341ead2ba6f2af98ce5ec3fe84f6b6d2899c0d b/tests/resources/merge-resolve.git/objects/5c/341ead2ba6f2af98ce5ec3fe84f6b6d2899c0d
new file mode 100644
index 0000000..63c86bd
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/5c/341ead2ba6f2af98ce5ec3fe84f6b6d2899c0d differ
diff --git a/tests/resources/merge-resolve.git/objects/5c/3b68a71fc4fa5d362fd3875e53137c6a5ab7a5 b/tests/resources/merge-resolve.git/objects/5c/3b68a71fc4fa5d362fd3875e53137c6a5ab7a5
new file mode 100644
index 0000000..5410014
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/5c/3b68a71fc4fa5d362fd3875e53137c6a5ab7a5 differ
diff --git a/tests/resources/merge-resolve.git/objects/5d/c1018e90b19654bee986b7a0c268804d39659d b/tests/resources/merge-resolve.git/objects/5d/c1018e90b19654bee986b7a0c268804d39659d
new file mode 100644
index 0000000..7500b99
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/5d/c1018e90b19654bee986b7a0c268804d39659d differ
diff --git a/tests/resources/merge-resolve.git/objects/5d/dd0fe66f990dc0e5cf9fec6d9b465240e9537f b/tests/resources/merge-resolve.git/objects/5d/dd0fe66f990dc0e5cf9fec6d9b465240e9537f
new file mode 100644
index 0000000..9d8691e
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/5d/dd0fe66f990dc0e5cf9fec6d9b465240e9537f differ
diff --git a/tests/resources/merge-resolve.git/objects/5e/b7bb6a146eb3c7fd3990b240a2308eceb1cf8d b/tests/resources/merge-resolve.git/objects/5e/b7bb6a146eb3c7fd3990b240a2308eceb1cf8d
new file mode 100644
index 0000000..aca2666
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/5e/b7bb6a146eb3c7fd3990b240a2308eceb1cf8d differ
diff --git a/tests/resources/merge-resolve.git/objects/5f/bfbdc04b4eca46f54f4853a3c5a1dce28f5165 b/tests/resources/merge-resolve.git/objects/5f/bfbdc04b4eca46f54f4853a3c5a1dce28f5165
new file mode 100644
index 0000000..aec3867
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/5f/bfbdc04b4eca46f54f4853a3c5a1dce28f5165 differ
diff --git a/tests/resources/merge-resolve.git/objects/60/61fe116ecba0800c26113ea1a7dfac2e16eeaf b/tests/resources/merge-resolve.git/objects/60/61fe116ecba0800c26113ea1a7dfac2e16eeaf
new file mode 100644
index 0000000..3f266f6
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/60/61fe116ecba0800c26113ea1a7dfac2e16eeaf differ
diff --git a/tests/resources/merge-resolve.git/objects/60/91fc2c036a382a69489e3f518ee5aae9a4e567 b/tests/resources/merge-resolve.git/objects/60/91fc2c036a382a69489e3f518ee5aae9a4e567
new file mode 100644
index 0000000..fa63afb
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/60/91fc2c036a382a69489e3f518ee5aae9a4e567 differ
diff --git a/tests/resources/merge-resolve.git/objects/61/340eeed7340fa6a8792def9a5938bb5d4434bb b/tests/resources/merge-resolve.git/objects/61/340eeed7340fa6a8792def9a5938bb5d4434bb
new file mode 100644
index 0000000..e830caf
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/61/340eeed7340fa6a8792def9a5938bb5d4434bb differ
diff --git a/tests/resources/merge-resolve.git/objects/61/78885b38fe96e825ac0f492c0a941f288b37f6 b/tests/resources/merge-resolve.git/objects/61/78885b38fe96e825ac0f492c0a941f288b37f6
new file mode 100644
index 0000000..bedc5f2
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/61/78885b38fe96e825ac0f492c0a941f288b37f6 differ
diff --git a/tests/resources/merge-resolve.git/objects/62/12c31dab5e482247d7977e4f0dd3601decf13b b/tests/resources/merge-resolve.git/objects/62/12c31dab5e482247d7977e4f0dd3601decf13b
new file mode 100644
index 0000000..b6f0607
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/62/12c31dab5e482247d7977e4f0dd3601decf13b differ
diff --git a/tests/resources/merge-resolve.git/objects/62/269111c3b02a9355badcb9da8678b1bf41787b b/tests/resources/merge-resolve.git/objects/62/269111c3b02a9355badcb9da8678b1bf41787b
new file mode 100644
index 0000000..0edf659
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/62/269111c3b02a9355badcb9da8678b1bf41787b differ
diff --git a/tests/resources/merge-resolve.git/objects/62/33c6a0670228627f93c01cef32485a30403670 b/tests/resources/merge-resolve.git/objects/62/33c6a0670228627f93c01cef32485a30403670
new file mode 100644
index 0000000..81428dd
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/62/33c6a0670228627f93c01cef32485a30403670 differ
diff --git a/tests/resources/merge-resolve.git/objects/62/c4f6533c9a3894191fdcb96a3be935ade63f1a b/tests/resources/merge-resolve.git/objects/62/c4f6533c9a3894191fdcb96a3be935ade63f1a
new file mode 100644
index 0000000..c0f822d
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/62/c4f6533c9a3894191fdcb96a3be935ade63f1a differ
diff --git a/tests/resources/merge-resolve.git/objects/63/247125386de9ec90a27ad36169307bf8a11a38 b/tests/resources/merge-resolve.git/objects/63/247125386de9ec90a27ad36169307bf8a11a38
new file mode 100644
index 0000000..bc2d738
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/63/247125386de9ec90a27ad36169307bf8a11a38
@@ -0,0 +1 @@
+xÝ;1 D©}Šé¶A‹Vâô\ÀÙ8¬¥àHIVp|²?‰‚ÐLãyO “ÃuN7C] Í¥ƒËlãt¦:iAÐ(xiŒp‚,ÆOñÄæ¡;•æo†7 …UYZ B‡½ß÷ý]ÆdUmÔyk©ô[ …½Úc©ñþÍ¥)©ñ!êX{¢¿Zó±ö
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/63/ec604d491161ddafdae4179843c26d54bd999a b/tests/resources/merge-resolve.git/objects/63/ec604d491161ddafdae4179843c26d54bd999a
new file mode 100644
index 0000000..bc74da5
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/63/ec604d491161ddafdae4179843c26d54bd999a differ
diff --git a/tests/resources/merge-resolve.git/objects/67/110d77886b2af6309b9212961e72b8583e5fa9 b/tests/resources/merge-resolve.git/objects/67/110d77886b2af6309b9212961e72b8583e5fa9
new file mode 100644
index 0000000..877bad7
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/67/110d77886b2af6309b9212961e72b8583e5fa9
@@ -0,0 +1 @@
+x¥=N1 „©÷î^rœ !J:.`'ûŠlP^×gâT3ú43Ò”Ñûuåp·¦*´Z£ %°ælÙÚ4irœÇH‰·žz,ê³¥ä[‰M]a“J©ÂÒbó5¤lÐ8OùX$XÕ³EaÇ")ŠUïœ$d2zO¸ñçÚÇ„—úųÂÛ>úm ð¨'ýqÏýZ渶 ÊèO`lF“³Oî1!n'=-ýÇÄöªó]A& e‡Ë¯^¶o––^Ý
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/67/18a45909532d1fcf5600d0877f7fe7e78f0b86 b/tests/resources/merge-resolve.git/objects/67/18a45909532d1fcf5600d0877f7fe7e78f0b86
new file mode 100644
index 0000000..ffda698
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/67/18a45909532d1fcf5600d0877f7fe7e78f0b86
@@ -0,0 +1 @@
+x¥ŽÑM1 DùNi`‘ ǹDBè~è€ Ç§]‰Ý ƒöY ð7óž4íû¾M 8<ÌaæF䬵@Ò˜r*‹Ü85ÆV«±eV÷.Î鉋”0($!“b½UÑ35É—¨¡8¹ÏµÿÒ¾d4ÿºöý£ þÉNú“®ö+þÚ£öýÙ#q@€rÉ~àNzžöÏ7Çö¹ÉÛ‚¸Ô!‡®î÷uQu
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/68/c6c84b091926c7d90aa6a79b2bc3bb6adccd8e b/tests/resources/merge-resolve.git/objects/68/c6c84b091926c7d90aa6a79b2bc3bb6adccd8e
new file mode 100644
index 0000000..1e4b075
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/68/c6c84b091926c7d90aa6a79b2bc3bb6adccd8e differ
diff --git a/tests/resources/merge-resolve.git/objects/68/f7c02064019d89e40e51d7776b6f67914420a2 b/tests/resources/merge-resolve.git/objects/68/f7c02064019d89e40e51d7776b6f67914420a2
new file mode 100644
index 0000000..809a5b3
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/68/f7c02064019d89e40e51d7776b6f67914420a2 differ
diff --git a/tests/resources/merge-resolve.git/objects/69/f570c57b24ea7c086e94c5e574964798321435 b/tests/resources/merge-resolve.git/objects/69/f570c57b24ea7c086e94c5e574964798321435
new file mode 100644
index 0000000..6975f0b
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/69/f570c57b24ea7c086e94c5e574964798321435 differ
diff --git a/tests/resources/merge-resolve.git/objects/6a/e1a3967031a42cf955d9d5c2395211ac82f6cf b/tests/resources/merge-resolve.git/objects/6a/e1a3967031a42cf955d9d5c2395211ac82f6cf
new file mode 100644
index 0000000..3b5713c
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/6a/e1a3967031a42cf955d9d5c2395211ac82f6cf differ
diff --git a/tests/resources/merge-resolve.git/objects/6b/7e37be8ce0b897093f2878a9dcd8f396beda2c b/tests/resources/merge-resolve.git/objects/6b/7e37be8ce0b897093f2878a9dcd8f396beda2c
new file mode 100644
index 0000000..c393186
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/6b/7e37be8ce0b897093f2878a9dcd8f396beda2c differ
diff --git a/tests/resources/merge-resolve.git/objects/6c/06dcd163587c2cc18be44857e0b71116382aeb b/tests/resources/merge-resolve.git/objects/6c/06dcd163587c2cc18be44857e0b71116382aeb
new file mode 100644
index 0000000..2f54be8
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/6c/06dcd163587c2cc18be44857e0b71116382aeb differ
diff --git a/tests/resources/merge-resolve.git/objects/6e/3b9eb35214d4e31ed5789afc7d520ac798ce55 b/tests/resources/merge-resolve.git/objects/6e/3b9eb35214d4e31ed5789afc7d520ac798ce55
new file mode 100644
index 0000000..c6100cb
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/6e/3b9eb35214d4e31ed5789afc7d520ac798ce55 differ
diff --git a/tests/resources/merge-resolve.git/objects/6f/32739c3724d1d5f855299309f388606f407468 b/tests/resources/merge-resolve.git/objects/6f/32739c3724d1d5f855299309f388606f407468
new file mode 100644
index 0000000..6741aa4
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/6f/32739c3724d1d5f855299309f388606f407468 differ
diff --git a/tests/resources/merge-resolve.git/objects/6f/a33014764bf1120a454eb8437ae098238e409b b/tests/resources/merge-resolve.git/objects/6f/a33014764bf1120a454eb8437ae098238e409b
new file mode 100644
index 0000000..973a4f6
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/6f/a33014764bf1120a454eb8437ae098238e409b differ
diff --git a/tests/resources/merge-resolve.git/objects/6f/be9fb85c86d7d1435f728da418bdff52c640a9 b/tests/resources/merge-resolve.git/objects/6f/be9fb85c86d7d1435f728da418bdff52c640a9
new file mode 100644
index 0000000..a2c8d93
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/6f/be9fb85c86d7d1435f728da418bdff52c640a9 differ
diff --git a/tests/resources/merge-resolve.git/objects/71/17467b18605a660ebe5586df69e2311ed5609f b/tests/resources/merge-resolve.git/objects/71/17467b18605a660ebe5586df69e2311ed5609f
new file mode 100644
index 0000000..02e1831
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/71/17467b18605a660ebe5586df69e2311ed5609f differ
diff --git a/tests/resources/merge-resolve.git/objects/71/2ebba6669ea847d9829e4f1059d6c830c8b531 b/tests/resources/merge-resolve.git/objects/71/2ebba6669ea847d9829e4f1059d6c830c8b531
new file mode 100644
index 0000000..dd7d58f
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/71/2ebba6669ea847d9829e4f1059d6c830c8b531 differ
diff --git a/tests/resources/merge-resolve.git/objects/71/add2d7b93d55bf3600f8a1582beceebbd050c8 b/tests/resources/merge-resolve.git/objects/71/add2d7b93d55bf3600f8a1582beceebbd050c8
new file mode 100644
index 0000000..221afa3
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/71/add2d7b93d55bf3600f8a1582beceebbd050c8 differ
diff --git a/tests/resources/merge-resolve.git/objects/72/cdb057b340205164478565e91eb71647e66891 b/tests/resources/merge-resolve.git/objects/72/cdb057b340205164478565e91eb71647e66891
new file mode 100644
index 0000000..84aa833
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/72/cdb057b340205164478565e91eb71647e66891 differ
diff --git a/tests/resources/merge-resolve.git/objects/72/ea499e108df5ff0a4a913e7655bbeeb1fb69f2 b/tests/resources/merge-resolve.git/objects/72/ea499e108df5ff0a4a913e7655bbeeb1fb69f2
new file mode 100644
index 0000000..4886e49
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/72/ea499e108df5ff0a4a913e7655bbeeb1fb69f2 differ
diff --git a/tests/resources/merge-resolve.git/objects/74/df13f0793afdaa972150bba976f7de8284914e b/tests/resources/merge-resolve.git/objects/74/df13f0793afdaa972150bba976f7de8284914e
new file mode 100644
index 0000000..cb50e67
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/74/df13f0793afdaa972150bba976f7de8284914e differ
diff --git a/tests/resources/merge-resolve.git/objects/75/a811bf6bc57694adb3fe604786f3a4efd1cd1b b/tests/resources/merge-resolve.git/objects/75/a811bf6bc57694adb3fe604786f3a4efd1cd1b
new file mode 100644
index 0000000..477fd87
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/75/a811bf6bc57694adb3fe604786f3a4efd1cd1b
@@ -0,0 +1,2 @@
+x¥ŽK
+1D]ç¹ÀHçk "n¼Hº;Ì€3‘õúŽâ
ÜU½EQç©këý¦7
Ž€ !²7Xdc2±ÇR¬ƒ˜À©[j²tMv… :q.°‹Äc¦D* l†(¤Ò£µé3¿Rc}ë|¯‹>ÈJ?é$_ñk[ªóQ,ìÑë"€Zéz¶ËŸ3ª·é9¥ë€ê
LŽOÊ
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/76/63fce0130db092936b137cabd693ec234eb060 b/tests/resources/merge-resolve.git/objects/76/63fce0130db092936b137cabd693ec234eb060
new file mode 100644
index 0000000..f578a4a
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/76/63fce0130db092936b137cabd693ec234eb060 differ
diff --git a/tests/resources/merge-resolve.git/objects/76/ab0e2868197ec158ddd6c78d8a0d2fd73d38f9 b/tests/resources/merge-resolve.git/objects/76/ab0e2868197ec158ddd6c78d8a0d2fd73d38f9
new file mode 100644
index 0000000..4d41ad8
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/76/ab0e2868197ec158ddd6c78d8a0d2fd73d38f9 differ
diff --git a/tests/resources/merge-resolve.git/objects/7a/a3edf2bcfee22398e6b55295aa56366b7aaf76 b/tests/resources/merge-resolve.git/objects/7a/a3edf2bcfee22398e6b55295aa56366b7aaf76
new file mode 100644
index 0000000..09f1e4d
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/7a/a3edf2bcfee22398e6b55295aa56366b7aaf76 differ
diff --git a/tests/resources/merge-resolve.git/objects/7a/a825857f87aea74ddf13d954568aa30dfcdeb4 b/tests/resources/merge-resolve.git/objects/7a/a825857f87aea74ddf13d954568aa30dfcdeb4
new file mode 100644
index 0000000..b9c0630
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/7a/a825857f87aea74ddf13d954568aa30dfcdeb4 differ
diff --git a/tests/resources/merge-resolve.git/objects/7a/f14d9c679baaef35555095f4f5d33e9a569ab9 b/tests/resources/merge-resolve.git/objects/7a/f14d9c679baaef35555095f4f5d33e9a569ab9
new file mode 100644
index 0000000..b4c4ef7
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/7a/f14d9c679baaef35555095f4f5d33e9a569ab9 differ
diff --git a/tests/resources/merge-resolve.git/objects/7c/04ca611203ed320c5f495b9813054dd23be3be b/tests/resources/merge-resolve.git/objects/7c/04ca611203ed320c5f495b9813054dd23be3be
new file mode 100644
index 0000000..e3ba605
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/7c/04ca611203ed320c5f495b9813054dd23be3be
@@ -0,0 +1,2 @@
+x¥ŽQ Dýæ{
-,tcüñ^`%õƒb(ÆëKÏà|ͼd&k)¯³±§ÞDÀsžl¢è<fɇ4a¶“1BŒŽ8zs“CvƒÅ˜„ºEëQüd¡˜ÅO>åEñ§¯µÁ#}¹%x®µìuƒ« z¸{yÅV÷šû%ÖrƒÉžÇ†·pÖ¨µt íòÇ„
+·¸ÎêUrL
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/7c/2c5228c9e90170d4a35e6558e47163daf092e5 b/tests/resources/merge-resolve.git/objects/7c/2c5228c9e90170d4a35e6558e47163daf092e5
new file mode 100644
index 0000000..52fde92
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/7c/2c5228c9e90170d4a35e6558e47163daf092e5 differ
diff --git a/tests/resources/merge-resolve.git/objects/7c/b63eed597130ba4abb87b3e544b85021905520 b/tests/resources/merge-resolve.git/objects/7c/b63eed597130ba4abb87b3e544b85021905520
new file mode 100644
index 0000000..769f29c
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/7c/b63eed597130ba4abb87b3e544b85021905520
@@ -0,0 +1,3 @@
+x¥ŽK
+1D]ç¹€Òùt'"n¼H: ÆÅL$F¼¾£xwUïAQÜ–å6´õf7ºˆI“T*zë±J
+–1#; @r´X]¬êžº¬C3A¨ì F'Îa‘j#Š”ÑTâšÀf a•žcn]_Ê+õ¢¯s[ mÕGÙè'å+~íÀm9iãÐ ¹‰PïÔF·³CþœQ¹§•gõe"NÕ
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/7e/2d058d5fedf8329db44db4fac610d6b1a89159 b/tests/resources/merge-resolve.git/objects/7e/2d058d5fedf8329db44db4fac610d6b1a89159
new file mode 100644
index 0000000..d12d7b4
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/7e/2d058d5fedf8329db44db4fac610d6b1a89159 differ
diff --git a/tests/resources/merge-resolve.git/objects/7f/7a2da58126226986d71c6ddfab4afba693280d b/tests/resources/merge-resolve.git/objects/7f/7a2da58126226986d71c6ddfab4afba693280d
new file mode 100644
index 0000000..2f833c2
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/7f/7a2da58126226986d71c6ddfab4afba693280d differ
diff --git a/tests/resources/merge-resolve.git/objects/80/a8fbb3abb1ba423d554e9630b8fc2e5698f86b b/tests/resources/merge-resolve.git/objects/80/a8fbb3abb1ba423d554e9630b8fc2e5698f86b
new file mode 100644
index 0000000..3daf6c3
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/80/a8fbb3abb1ba423d554e9630b8fc2e5698f86b differ
diff --git a/tests/resources/merge-resolve.git/objects/81/1c70fcb6d5bbd022d04cc31836d30b436f9551 b/tests/resources/merge-resolve.git/objects/81/1c70fcb6d5bbd022d04cc31836d30b436f9551
new file mode 100644
index 0000000..6d87024
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/81/1c70fcb6d5bbd022d04cc31836d30b436f9551 differ
diff --git a/tests/resources/merge-resolve.git/objects/81/87117062b750eed4f93fd7e899f17b52ce554d b/tests/resources/merge-resolve.git/objects/81/87117062b750eed4f93fd7e899f17b52ce554d
new file mode 100644
index 0000000..19cac9f
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/81/87117062b750eed4f93fd7e899f17b52ce554d differ
diff --git a/tests/resources/merge-resolve.git/objects/83/07d93a155903a5c49576583f0ce1f6ff897c0e b/tests/resources/merge-resolve.git/objects/83/07d93a155903a5c49576583f0ce1f6ff897c0e
new file mode 100644
index 0000000..5a96a4e
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/83/07d93a155903a5c49576583f0ce1f6ff897c0e differ
diff --git a/tests/resources/merge-resolve.git/objects/83/6b8b82b26cab22eaaed8820877c76d6c8bca19 b/tests/resources/merge-resolve.git/objects/83/6b8b82b26cab22eaaed8820877c76d6c8bca19
new file mode 100644
index 0000000..99f8286
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/83/6b8b82b26cab22eaaed8820877c76d6c8bca19 differ
diff --git a/tests/resources/merge-resolve.git/objects/83/824a8c6658768e2013905219cc8c64cc3d9a2e b/tests/resources/merge-resolve.git/objects/83/824a8c6658768e2013905219cc8c64cc3d9a2e
new file mode 100644
index 0000000..066190f
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/83/824a8c6658768e2013905219cc8c64cc3d9a2e differ
diff --git a/tests/resources/merge-resolve.git/objects/84/9619b03ae540acee4d1edec96b86993da6b497 b/tests/resources/merge-resolve.git/objects/84/9619b03ae540acee4d1edec96b86993da6b497
new file mode 100644
index 0000000..67271ac
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/84/9619b03ae540acee4d1edec96b86993da6b497
@@ -0,0 +1,3 @@
+x¥ŽK
+1D]ç¹€Òùv7ÞÀ½t’3‹L$ñúŽâ
ÜU½E¥Vë<¤¶v7:³"xç ¥K@›R¶
+rÌŠ#Ç" Ôy2[
Xµ5 r2ÆQ´ˆå¨5–”£bŠ=ÇÔº¼æõ,oS«k[ä‰7úIþŠ_;¤VÏRç”?ú`ä <€ØèvvðŸ3"¶1ÝóÜWñEÇP
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/84/de84f8f3a6d63e636ee9ad81f4b80512fa9bbe b/tests/resources/merge-resolve.git/objects/84/de84f8f3a6d63e636ee9ad81f4b80512fa9bbe
new file mode 100644
index 0000000..32f1461
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/84/de84f8f3a6d63e636ee9ad81f4b80512fa9bbe differ
diff --git a/tests/resources/merge-resolve.git/objects/86/088dae8bade454995b21a1c88107b0e1accdab b/tests/resources/merge-resolve.git/objects/86/088dae8bade454995b21a1c88107b0e1accdab
new file mode 100644
index 0000000..623a747
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/86/088dae8bade454995b21a1c88107b0e1accdab differ
diff --git a/tests/resources/merge-resolve.git/objects/87/b4926260d77a3b851e71ecce06839bd650b231 b/tests/resources/merge-resolve.git/objects/87/b4926260d77a3b851e71ecce06839bd650b231
new file mode 100644
index 0000000..91944ff
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/87/b4926260d77a3b851e71ecce06839bd650b231 differ
diff --git a/tests/resources/merge-resolve.git/objects/88/e185910a15cd13bdf44854ad037f4842b03b29 b/tests/resources/merge-resolve.git/objects/88/e185910a15cd13bdf44854ad037f4842b03b29
new file mode 100644
index 0000000..ae1c5e2
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/88/e185910a15cd13bdf44854ad037f4842b03b29 differ
diff --git a/tests/resources/merge-resolve.git/objects/8a/ad9d0ea334951da47b621a475b39cc6ed759bf b/tests/resources/merge-resolve.git/objects/8a/ad9d0ea334951da47b621a475b39cc6ed759bf
new file mode 100644
index 0000000..5e2c943
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/8a/ad9d0ea334951da47b621a475b39cc6ed759bf differ
diff --git a/tests/resources/merge-resolve.git/objects/8a/ae714f7d939309d7f132b30646d96743134a9f b/tests/resources/merge-resolve.git/objects/8a/ae714f7d939309d7f132b30646d96743134a9f
new file mode 100644
index 0000000..34ff560
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/8a/ae714f7d939309d7f132b30646d96743134a9f
@@ -0,0 +1 @@
+x+)JMU06³`040031QH,-ÉÏM-JOMLÊIÕ+©(aH:,»:ÎCÉýúô:ÞË ²o>ZC'g$楧¦èfæé&%æ%g€5¬ÎqYôÂeÒZoÇÝÙkÚMíæ2éÆÔ›X\’ZDPC~^ZNfrIf^:Xéõ› ZHÙŠž1O(_œ,'º×
jv^j9È!Ɖ9%`¥<sBÞ§ÝHrèSæ¼3§d ã ¨Ò¢ÔÜü2 wßüI{•|þ¹÷ 2m» gÜ˾‹©ÉÝ1ÖËåüŠ5Ó¿Ü ,\“µ})TC)00ÀavʉùzÖ›¦9–¤×Mü°úÕ…'6óbÊå’G
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/8b/095d8fd01594f4d14454d073e3ac57b9ce485f b/tests/resources/merge-resolve.git/objects/8b/095d8fd01594f4d14454d073e3ac57b9ce485f
new file mode 100644
index 0000000..4ec0138
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/8b/095d8fd01594f4d14454d073e3ac57b9ce485f differ
diff --git a/tests/resources/merge-resolve.git/objects/8b/5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a b/tests/resources/merge-resolve.git/objects/8b/5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a
new file mode 100644
index 0000000..f4249c2
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/8b/5b53cb2aa9ceb1139f5312fcfa3cc3c5a47c9a
@@ -0,0 +1 @@
+xí± À0 S{Š "2ŽŒd,0²‘^?&S¤HóÕÝŸ[Ï8ï눪E›`Ñ„ËrƒZŠ*êdŒ¥ÆrlŒ,©± ÙcbF/ ·“¶÷'¿ûågв
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/8b/7cd60d49ce3a1a770ece43b7d29b5cf462a33a b/tests/resources/merge-resolve.git/objects/8b/7cd60d49ce3a1a770ece43b7d29b5cf462a33a
new file mode 100644
index 0000000..790750c
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/8b/7cd60d49ce3a1a770ece43b7d29b5cf462a33a differ
diff --git a/tests/resources/merge-resolve.git/objects/8b/fb012a6d809e499bd8d3e194a3929bc8995b93 b/tests/resources/merge-resolve.git/objects/8b/fb012a6d809e499bd8d3e194a3929bc8995b93
new file mode 100644
index 0000000..a90ee08
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/8b/fb012a6d809e499bd8d3e194a3929bc8995b93 differ
diff --git a/tests/resources/merge-resolve.git/objects/8c/749d9968d4b10dcfb06c9f97d0e5d92d337071 b/tests/resources/merge-resolve.git/objects/8c/749d9968d4b10dcfb06c9f97d0e5d92d337071
new file mode 100644
index 0000000..e42393c
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/8c/749d9968d4b10dcfb06c9f97d0e5d92d337071
@@ -0,0 +1,2 @@
+x¥ŽAB!C]s
+. a€ù cÜx÷f`†|_ b¼¾h¼»ö5mšëº^»¶ÞmzÑÙL“`ð”}$26#"8° ÅÆ`s.`Ԛܺ.!bH\<» i´"Á ,K¦œ8¯èÙ—Úô‰_ÔXŸ—º>êMïeÐ:Ê7ø¹]®ëAƒC40ÏÞ뙌QƒŽ³]þœQ\.Ä,¬ÞVO
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/8f/4433f8593ddd65b7dd43dd4564d841f4d9c8aa b/tests/resources/merge-resolve.git/objects/8f/4433f8593ddd65b7dd43dd4564d841f4d9c8aa
new file mode 100644
index 0000000..d2de777
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/8f/4433f8593ddd65b7dd43dd4564d841f4d9c8aa differ
diff --git a/tests/resources/merge-resolve.git/objects/90/a336c7dacbe295159413559b0043b8bdc60d57 b/tests/resources/merge-resolve.git/objects/90/a336c7dacbe295159413559b0043b8bdc60d57
new file mode 100644
index 0000000..35453eb
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/90/a336c7dacbe295159413559b0043b8bdc60d57 differ
diff --git a/tests/resources/merge-resolve.git/objects/91/2b2d7819cf9c1029e414883857ed61d597a1a5 b/tests/resources/merge-resolve.git/objects/91/2b2d7819cf9c1029e414883857ed61d597a1a5
new file mode 100644
index 0000000..d5df393
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/91/2b2d7819cf9c1029e414883857ed61d597a1a5 differ
diff --git a/tests/resources/merge-resolve.git/objects/91/8bb3e09090a9995d48af9a2a6296d7e6088d1c b/tests/resources/merge-resolve.git/objects/91/8bb3e09090a9995d48af9a2a6296d7e6088d1c
new file mode 100644
index 0000000..c214ab2
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/91/8bb3e09090a9995d48af9a2a6296d7e6088d1c differ
diff --git a/tests/resources/merge-resolve.git/objects/91/f44111cb1cb1358ac6944ad356ca1738813ea1 b/tests/resources/merge-resolve.git/objects/91/f44111cb1cb1358ac6944ad356ca1738813ea1
new file mode 100644
index 0000000..51a456f
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/91/f44111cb1cb1358ac6944ad356ca1738813ea1 differ
diff --git a/tests/resources/merge-resolve.git/objects/92/7d4943cdbdc9a667db8e62cfd0a41870235c51 b/tests/resources/merge-resolve.git/objects/92/7d4943cdbdc9a667db8e62cfd0a41870235c51
new file mode 100644
index 0000000..b6b92c8
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/92/7d4943cdbdc9a667db8e62cfd0a41870235c51 differ
diff --git a/tests/resources/merge-resolve.git/objects/93/77fccdb210540b8c0520cc6e80eb632c20bd25 b/tests/resources/merge-resolve.git/objects/93/77fccdb210540b8c0520cc6e80eb632c20bd25
new file mode 100644
index 0000000..4b2d93b
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/93/77fccdb210540b8c0520cc6e80eb632c20bd25 differ
diff --git a/tests/resources/merge-resolve.git/objects/94/29c05dd6f6f39fc567b4ce923b16df5d3d7a7a b/tests/resources/merge-resolve.git/objects/94/29c05dd6f6f39fc567b4ce923b16df5d3d7a7a
new file mode 100644
index 0000000..d4d93f5
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/94/29c05dd6f6f39fc567b4ce923b16df5d3d7a7a differ
diff --git a/tests/resources/merge-resolve.git/objects/94/4f5dd1a867cab4c2bbcb896493435cae1dcc1a b/tests/resources/merge-resolve.git/objects/94/4f5dd1a867cab4c2bbcb896493435cae1dcc1a
new file mode 100644
index 0000000..1430938
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/94/4f5dd1a867cab4c2bbcb896493435cae1dcc1a
@@ -0,0 +1,2 @@
+x¥ŽK!D]s
+. zšÄ7ÞÀ Ð|2. b¼¾h¼»ªWÉKÅVëmH0~7zÎÒ"¦PÈ9`ò:»ÀÑQôi)QÈLEyq=oC*P6-"4„l0StAŽHÌ<u$Âs¬ËKz…žäumõÑ6yÌ“~Ò9‡_;ÄVORç4z½X¹W¨”˜tž ùOà6Vññ4NF
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/94/8ba6e701c1edab0c2d394fb7c5538334129793 b/tests/resources/merge-resolve.git/objects/94/8ba6e701c1edab0c2d394fb7c5538334129793
new file mode 100644
index 0000000..b3e3ef9
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/94/8ba6e701c1edab0c2d394fb7c5538334129793 differ
diff --git a/tests/resources/merge-resolve.git/objects/95/646149ab6b6ba6edc83cff678582538b457b2b b/tests/resources/merge-resolve.git/objects/95/646149ab6b6ba6edc83cff678582538b457b2b
new file mode 100644
index 0000000..de9ba28
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/95/646149ab6b6ba6edc83cff678582538b457b2b
@@ -0,0 +1,3 @@
+x•ŽMÂ …]s
+. ™ÃObŒoàÞ eH»h1ãõEÓ ¸{?y_ÞX–enR}h•Y* üHFS
+€S ž!$À1…¨Å“*¯M’³˜£w Uv4ôIt:ª„è²ÏÞ8KFEA¯6•*oéM5ÉûT–¬òÌ=ýª+ÿŠÝƲ\ä Ñ CV Áˆžö³ÿÆà`ƒnLj” ÛœX‰iO\
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/95/9de65e568274120fdf9e3af9f77b1550122149 b/tests/resources/merge-resolve.git/objects/95/9de65e568274120fdf9e3af9f77b1550122149
new file mode 100644
index 0000000..e998de8
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/95/9de65e568274120fdf9e3af9f77b1550122149 differ
diff --git a/tests/resources/merge-resolve.git/objects/96/8ca794a4597f7f6abbb2b8d940b4078a0f3fd4 b/tests/resources/merge-resolve.git/objects/96/8ca794a4597f7f6abbb2b8d940b4078a0f3fd4
new file mode 100644
index 0000000..359e43a
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/96/8ca794a4597f7f6abbb2b8d940b4078a0f3fd4 differ
diff --git a/tests/resources/merge-resolve.git/objects/96/bca8d4f05cc4c5e33e4389f80a1309e86fe054 b/tests/resources/merge-resolve.git/objects/96/bca8d4f05cc4c5e33e4389f80a1309e86fe054
new file mode 100644
index 0000000..8938d3e
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/96/bca8d4f05cc4c5e33e4389f80a1309e86fe054 differ
diff --git a/tests/resources/merge-resolve.git/objects/97/7c696519c5a3004c5f1d15d60c89dbeb8f235f b/tests/resources/merge-resolve.git/objects/97/7c696519c5a3004c5f1d15d60c89dbeb8f235f
new file mode 100644
index 0000000..e561b47
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/97/7c696519c5a3004c5f1d15d60c89dbeb8f235f differ
diff --git a/tests/resources/merge-resolve.git/objects/98/ba4205fcf31f5dd93c916d35fe3f3b3d0e6714 b/tests/resources/merge-resolve.git/objects/98/ba4205fcf31f5dd93c916d35fe3f3b3d0e6714
new file mode 100644
index 0000000..6f5e979
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/98/ba4205fcf31f5dd93c916d35fe3f3b3d0e6714
@@ -0,0 +1 @@
+x-ŒÁ
Ã0 ûÖ ÐþºG % È…"ë×Mú!@ yÉjÂýñ¼½Šv¬j‚¢:ï AÜÁ‹ÂAÇèM~dú¹ãÐ{.3Ñ);ÔlÂç]vi›ú6Á„D%þ «¯¦9fú|.z
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/98/d52d07c0b0bbf2b46548f6aa521295c2cb55db b/tests/resources/merge-resolve.git/objects/98/d52d07c0b0bbf2b46548f6aa521295c2cb55db
new file mode 100644
index 0000000..c8d636e
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/98/d52d07c0b0bbf2b46548f6aa521295c2cb55db
@@ -0,0 +1,3 @@
+xíA
+€0=÷y„}NË®taÝJ[ï
+ú/^r“’´$ŒÓ<ô,
‡¨"1*[\™ †žYj Ñ‹(;Ôóm£9ƒ oNŒxcëz"1ï(»7„áy÷Û—.øõ®þ
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/99/b4f7e4f24470fa06b980bc21f1095c2a9425c0 b/tests/resources/merge-resolve.git/objects/99/b4f7e4f24470fa06b980bc21f1095c2a9425c0
new file mode 100644
index 0000000..01ad66e
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/99/b4f7e4f24470fa06b980bc21f1095c2a9425c0 differ
diff --git a/tests/resources/merge-resolve.git/objects/9a/301fbe6fada7dcb74fcd7c20269b5c743459a7 b/tests/resources/merge-resolve.git/objects/9a/301fbe6fada7dcb74fcd7c20269b5c743459a7
new file mode 100644
index 0000000..f413cc5
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/9a/301fbe6fada7dcb74fcd7c20269b5c743459a7 differ
diff --git a/tests/resources/merge-resolve.git/objects/9a/f731fa116d1eb9a6c0109562472cfee6f5a979 b/tests/resources/merge-resolve.git/objects/9a/f731fa116d1eb9a6c0109562472cfee6f5a979
new file mode 100644
index 0000000..53233c4
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/9a/f731fa116d1eb9a6c0109562472cfee6f5a979 differ
diff --git a/tests/resources/merge-resolve.git/objects/9c/0b6c34ef379a42d858f03fef38630f476b9102 b/tests/resources/merge-resolve.git/objects/9c/0b6c34ef379a42d858f03fef38630f476b9102
new file mode 100644
index 0000000..e6f8500
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/9c/0b6c34ef379a42d858f03fef38630f476b9102 differ
diff --git a/tests/resources/merge-resolve.git/objects/9e/7f4359c469f309b6057febf4c6e80742cbed5b b/tests/resources/merge-resolve.git/objects/9e/7f4359c469f309b6057febf4c6e80742cbed5b
new file mode 100644
index 0000000..72b7c49
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/9e/7f4359c469f309b6057febf4c6e80742cbed5b differ
diff --git a/tests/resources/merge-resolve.git/objects/9e/fe7723802d4305142eee177e018fee1572c4f4 b/tests/resources/merge-resolve.git/objects/9e/fe7723802d4305142eee177e018fee1572c4f4
new file mode 100644
index 0000000..c63fc2c
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/9e/fe7723802d4305142eee177e018fee1572c4f4 differ
diff --git a/tests/resources/merge-resolve.git/objects/9f/74397a3397b3585faf09e9926b110d7f654254 b/tests/resources/merge-resolve.git/objects/9f/74397a3397b3585faf09e9926b110d7f654254
new file mode 100644
index 0000000..e7ec397
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/9f/74397a3397b3585faf09e9926b110d7f654254 differ
diff --git a/tests/resources/merge-resolve.git/objects/a0/31a28ae70e33a641ce4b8a8f6317f1ab79dee4 b/tests/resources/merge-resolve.git/objects/a0/31a28ae70e33a641ce4b8a8f6317f1ab79dee4
new file mode 100644
index 0000000..a6c05d1
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/a0/31a28ae70e33a641ce4b8a8f6317f1ab79dee4 differ
diff --git a/tests/resources/merge-resolve.git/objects/a1/07e18a58f38c46086c8f8f1dcd54c40154eeb6 b/tests/resources/merge-resolve.git/objects/a1/07e18a58f38c46086c8f8f1dcd54c40154eeb6
new file mode 100644
index 0000000..598c6a7
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/a1/07e18a58f38c46086c8f8f1dcd54c40154eeb6
@@ -0,0 +1,3 @@
+xK
+1]ç½$“Ä|`7.Ü{Îgœ“@&£×7^ÁZ=
+ jÎÔa²îÐ[J pÑùàƒ‘FH ÎZïQIg#P4Èî}
nñƒ-Âcy«æ4ìo]ŸÔ×ÝŸB͘”Õúl¬Vpä6ì¨öôïŸÝ u´ô¦ja_É ?H
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/a2/d8d1824c68541cca94ffb90f79291eba495921 b/tests/resources/merge-resolve.git/objects/a2/d8d1824c68541cca94ffb90f79291eba495921
new file mode 100644
index 0000000..2d3d947
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/a2/d8d1824c68541cca94ffb90f79291eba495921 differ
diff --git a/tests/resources/merge-resolve.git/objects/a3/9a620dae5bc8b4e771cd4d251b7d080401a21e b/tests/resources/merge-resolve.git/objects/a3/9a620dae5bc8b4e771cd4d251b7d080401a21e
new file mode 100644
index 0000000..4d22586
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/a3/9a620dae5bc8b4e771cd4d251b7d080401a21e differ
diff --git a/tests/resources/merge-resolve.git/objects/a3/fabece9eb8748da810e1e08266fef9b7136ad4 b/tests/resources/merge-resolve.git/objects/a3/fabece9eb8748da810e1e08266fef9b7136ad4
new file mode 100644
index 0000000..24d7dbc
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/a3/fabece9eb8748da810e1e08266fef9b7136ad4 differ
diff --git a/tests/resources/merge-resolve.git/objects/a4/1b1bb6d0be3c22fb654234c33b428e15c8cc27 b/tests/resources/merge-resolve.git/objects/a4/1b1bb6d0be3c22fb654234c33b428e15c8cc27
new file mode 100644
index 0000000..60789ee
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/a4/1b1bb6d0be3c22fb654234c33b428e15c8cc27 differ
diff --git a/tests/resources/merge-resolve.git/objects/a4/3150a738849c59376cf30bb2a68348a83c8f48 b/tests/resources/merge-resolve.git/objects/a4/3150a738849c59376cf30bb2a68348a83c8f48
new file mode 100644
index 0000000..06ae09e
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/a4/3150a738849c59376cf30bb2a68348a83c8f48 differ
diff --git a/tests/resources/merge-resolve.git/objects/a5/563304ddf6caba25cb50323a2ea6f7dbfcadca b/tests/resources/merge-resolve.git/objects/a5/563304ddf6caba25cb50323a2ea6f7dbfcadca
new file mode 100644
index 0000000..a831878
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/a5/563304ddf6caba25cb50323a2ea6f7dbfcadca differ
diff --git a/tests/resources/merge-resolve.git/objects/a7/08b253bd507417ec42d1467a7fd2d7519c4956 b/tests/resources/merge-resolve.git/objects/a7/08b253bd507417ec42d1467a7fd2d7519c4956
new file mode 100644
index 0000000..bae752a
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/a7/08b253bd507417ec42d1467a7fd2d7519c4956 differ
diff --git a/tests/resources/merge-resolve.git/objects/a7/65fb87eb2f7a1920b73b2d5a057f8f8476a42b b/tests/resources/merge-resolve.git/objects/a7/65fb87eb2f7a1920b73b2d5a057f8f8476a42b
new file mode 100644
index 0000000..30abd8b
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/a7/65fb87eb2f7a1920b73b2d5a057f8f8476a42b differ
diff --git a/tests/resources/merge-resolve.git/objects/a7/7a56a49f8f3ae242e02717f18ebbc60c5cc543 b/tests/resources/merge-resolve.git/objects/a7/7a56a49f8f3ae242e02717f18ebbc60c5cc543
new file mode 100644
index 0000000..76dd5f9
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/a7/7a56a49f8f3ae242e02717f18ebbc60c5cc543 differ
diff --git a/tests/resources/merge-resolve.git/objects/a7/dbfcbfc1a60709cb80b5ca24539008456531d0 b/tests/resources/merge-resolve.git/objects/a7/dbfcbfc1a60709cb80b5ca24539008456531d0
new file mode 100644
index 0000000..67126c9
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/a7/dbfcbfc1a60709cb80b5ca24539008456531d0
@@ -0,0 +1 @@
+x¥NË
!õL4 a˜ ÀÄ/vàÝð²{`1,ÆöEcÞÞ?/ÖR–.õ„»Þ˜%3$“ÁL1 5fe53'4Á2ÅÃ7^G1yBGV…LAGä Ù*‘ôä|R) ÿìsmòš^¾%y›kÙê*O<Ôºð×ø±C¬å,‰À’{e”C g;ÿ9#R¾oKboœ³NÀ
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/a8/02e06f1782a9645b9851bc7202cee74a8a4972 b/tests/resources/merge-resolve.git/objects/a8/02e06f1782a9645b9851bc7202cee74a8a4972
new file mode 100644
index 0000000..d39034b
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/a8/02e06f1782a9645b9851bc7202cee74a8a4972 differ
diff --git a/tests/resources/merge-resolve.git/objects/a8/87dd39ad3edd610fc9083dcb61e40ab50673d1 b/tests/resources/merge-resolve.git/objects/a8/87dd39ad3edd610fc9083dcb61e40ab50673d1
new file mode 100644
index 0000000..968c42a
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/a8/87dd39ad3edd610fc9083dcb61e40ab50673d1
@@ -0,0 +1 @@
+x+)JMU067a040031QH,-ÉÏM-JOMLÊIÕ+©(aH:,»:ÎCÉýúô:ÞË ²o>ZC'g$楧¦èfæé&%æ%g€5¬ÎqYôÂeÒZoÇÝÙkÚMíæ2éÆÔ›X\’ZDPC~^ZNfrIf^:Xéõ› ZHÙŠž1O(_œ,'º×
jv^j¹nb^ŠnJfZZjQj^ XÃû#3ƒ|>²^Uó:þ'äAÝÔ2¿†R¨†¢ÔÜü2 ×ßüI{•|þ¹÷ 2m» gÜ˾‹©Éõ1ÖËåüŠ5Ó¿Ü ,\“µ})TC)0HÀ!vʉùzÖ›¦9–¤×Mü°úÕ…'6óbG–x
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/a9/0bc3fb6f15181972a2959a921429efbd81a473 b/tests/resources/merge-resolve.git/objects/a9/0bc3fb6f15181972a2959a921429efbd81a473
new file mode 100644
index 0000000..91113ee
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/a9/0bc3fb6f15181972a2959a921429efbd81a473
@@ -0,0 +1,2 @@
+x¥ŽK
+1D]ç}¥;ÿ7ÞÀ½dÒ=Œ‹‰¯ooà®^UQT®¥\;hk6½‰@¦™Â‰gŒ §5r’èƒÑ“–Œ]uOMn òdg Äz›&ÒècÆ圈õ¨'•ž}
NüJá¼Öò¨7ØËp?ê(ßàG»\ËÈ8‡¼CØ¢GTà g»ü9£x¹$faõxN"
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/ab/40af3cb8a3ed2e2843e96d9aa7871336b94573 b/tests/resources/merge-resolve.git/objects/ab/40af3cb8a3ed2e2843e96d9aa7871336b94573
new file mode 100644
index 0000000..7da1da6
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ab/40af3cb8a3ed2e2843e96d9aa7871336b94573 differ
diff --git a/tests/resources/merge-resolve.git/objects/ab/6c44a2e84492ad4b41bb6bac87353e9d02ac8b b/tests/resources/merge-resolve.git/objects/ab/6c44a2e84492ad4b41bb6bac87353e9d02ac8b
new file mode 100644
index 0000000..d840c1a
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ab/6c44a2e84492ad4b41bb6bac87353e9d02ac8b differ
diff --git a/tests/resources/merge-resolve.git/objects/ab/929391ac42572f92110f3deeb4f0844a951e22 b/tests/resources/merge-resolve.git/objects/ab/929391ac42572f92110f3deeb4f0844a951e22
new file mode 100644
index 0000000..8840d00
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ab/929391ac42572f92110f3deeb4f0844a951e22 differ
diff --git a/tests/resources/merge-resolve.git/objects/ac/4045f965119e6998f4340ed0f411decfb3ec05 b/tests/resources/merge-resolve.git/objects/ac/4045f965119e6998f4340ed0f411decfb3ec05
new file mode 100644
index 0000000..4c32d63
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ac/4045f965119e6998f4340ed0f411decfb3ec05 differ
diff --git a/tests/resources/merge-resolve.git/objects/ad/01aebfdf2ac13145efafe3f9fcf798882f1730 b/tests/resources/merge-resolve.git/objects/ad/01aebfdf2ac13145efafe3f9fcf798882f1730
new file mode 100644
index 0000000..ae3ef8c
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ad/01aebfdf2ac13145efafe3f9fcf798882f1730 differ
diff --git a/tests/resources/merge-resolve.git/objects/ad/26b598134264fd284292cb233fc0b2f25851da b/tests/resources/merge-resolve.git/objects/ad/26b598134264fd284292cb233fc0b2f25851da
new file mode 100644
index 0000000..5819a2e
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ad/26b598134264fd284292cb233fc0b2f25851da differ
diff --git a/tests/resources/merge-resolve.git/objects/ad/a14492498136771f69dd451866cabcb0e9ef9a b/tests/resources/merge-resolve.git/objects/ad/a14492498136771f69dd451866cabcb0e9ef9a
new file mode 100644
index 0000000..71023de
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ad/a14492498136771f69dd451866cabcb0e9ef9a differ
diff --git a/tests/resources/merge-resolve.git/objects/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87 b/tests/resources/merge-resolve.git/objects/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87
new file mode 100644
index 0000000..3091b8f
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/ad/a55a45d14527dc3dfc714ea1c65d2e1e6fbe87
@@ -0,0 +1 @@
+x+)JMU067d040031QH,-ÉÏM-JOMLÊIÕ+©(aH:,»:ÎCÉýúô:ÞË ²o>ZC'g$楧¦èfæé&%æ%g€5¬ÎqYôÂeÒZoÇÝÙkÚMíæ2éÆÔ›X\’ZDPC~^ZNfrIf^:Xéõ› ZHÙŠž1O(_œ,'º×
jvn~JfZ&Ä5†Æ`ÕÆnלU7Ï V.6™t6ôÇL/•R¨ê¢ÔÜü2 §ßüI{•|þ¹÷ 2m» gÜ˾‹©Éé1ÖËåüŠ5Ó¿Ü ,\“µ})TC)0<ÀÁvʉùzÖ›¦9–¤×Mü°úÕ…'6ób±N’*
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/b2/d399ae15224e1d58066e3c8df70ce37de7a656 b/tests/resources/merge-resolve.git/objects/b2/d399ae15224e1d58066e3c8df70ce37de7a656
new file mode 100644
index 0000000..20fa838
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/b2/d399ae15224e1d58066e3c8df70ce37de7a656
@@ -0,0 +1,2 @@
+xíQA1ôÌ+x€ÙÄ‹‰Ï¡-kI*5”f¿/»zõîÁ af˜!¤Ö^/·“W¸Jcܤ5LŒÆ›‰;+ŠBŸ6ÎHZP|`îóh>\(óÙ$“sà´î•íX·@š ¢75€}57¹K
+¯µ+= ;g—® @нÒ!¬4Úè!Œ,\$\ \Âb/±ÉHsø©#þa¾¼÷QÄß
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/b4/2712cfe99a1a500b2a51fe984e0b8a7702ba11 b/tests/resources/merge-resolve.git/objects/b4/2712cfe99a1a500b2a51fe984e0b8a7702ba11
new file mode 100644
index 0000000..2820b46
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/b4/2712cfe99a1a500b2a51fe984e0b8a7702ba11
@@ -0,0 +1,5 @@
+xíA
+À {öû†Bé{M1 ¨¥ß¯>£PØËË –‹3ŽýÜFÖŽ7Á¥E02
<Z
+XÐĨJ
+ÃAˆ^«Ú
+ün dim=p#‹Yz¿÷“?¼ \»š
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/b6/9fe837e4cecfd4c9a40cdca7c138468687df07 b/tests/resources/merge-resolve.git/objects/b6/9fe837e4cecfd4c9a40cdca7c138468687df07
new file mode 100644
index 0000000..6dbcb05
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/b6/9fe837e4cecfd4c9a40cdca7c138468687df07
@@ -0,0 +1,2 @@
+xí’A
+1E»Î)þf7í}ÌŒ!‚QH zýZºí\|üOùU½âµ? Ñe!‹pJk<ÙM”oQ-¤ËQéÑàáI >†Ûý¶‹XŽ0üš¹Ì’ê,)ë$;:¯‚Ü·î þÍÆ(óä:
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/b6/f610aef53bd343e6c96227de874c66f00ee8e8 b/tests/resources/merge-resolve.git/objects/b6/f610aef53bd343e6c96227de874c66f00ee8e8
new file mode 100644
index 0000000..fb102f1
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/b6/f610aef53bd343e6c96227de874c66f00ee8e8 differ
diff --git a/tests/resources/merge-resolve.git/objects/b7/a2576f9fc20024ac9ef17cb134acbd1ac73127 b/tests/resources/merge-resolve.git/objects/b7/a2576f9fc20024ac9ef17cb134acbd1ac73127
new file mode 100644
index 0000000..22f2d13
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/b7/a2576f9fc20024ac9ef17cb134acbd1ac73127 differ
diff --git a/tests/resources/merge-resolve.git/objects/b8/a3a806d3950e8c0a03a34f234a92eff0e2c68d b/tests/resources/merge-resolve.git/objects/b8/a3a806d3950e8c0a03a34f234a92eff0e2c68d
new file mode 100644
index 0000000..24f0299
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/b8/a3a806d3950e8c0a03a34f234a92eff0e2c68d differ
diff --git a/tests/resources/merge-resolve.git/objects/ba/cac9b3493509aa15e1730e1545fc0919d1dae0 b/tests/resources/merge-resolve.git/objects/ba/cac9b3493509aa15e1730e1545fc0919d1dae0
new file mode 100644
index 0000000..f35586f
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ba/cac9b3493509aa15e1730e1545fc0919d1dae0 differ
diff --git a/tests/resources/merge-resolve.git/objects/bc/744705e1d8a019993cf88f62bc4020f1b80919 b/tests/resources/merge-resolve.git/objects/bc/744705e1d8a019993cf88f62bc4020f1b80919
new file mode 100644
index 0000000..0d4bdb3
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/bc/744705e1d8a019993cf88f62bc4020f1b80919
@@ -0,0 +1,2 @@
+x¥ŽK
+1D]ç}%ÿˆ¸ñî%t˜YÄH&âõâ
ÜU½¢ŠJÖu€Ôj7:P(Ú#¥”¬ÌF§Ì„Ä£1”°Ù+kÙ#vºˆÎš‚ÞÊ⢒£S8«‘W|ñÚÙ¨%²ø KëpɯØ3\—V·v‡#MúQgú?wHž@(c„
ž ØsË9›tž ôç Ë嶙{ŸkOó
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/bc/85d1aad435ff3705a8c30ace85f7542c5736cb b/tests/resources/merge-resolve.git/objects/bc/85d1aad435ff3705a8c30ace85f7542c5736cb
new file mode 100644
index 0000000..ae529fe
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/bc/85d1aad435ff3705a8c30ace85f7542c5736cb differ
diff --git a/tests/resources/merge-resolve.git/objects/bc/95c75d59386147d1e79a87c33068d8dbfd71f2 b/tests/resources/merge-resolve.git/objects/bc/95c75d59386147d1e79a87c33068d8dbfd71f2
new file mode 100644
index 0000000..436d5a0
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/bc/95c75d59386147d1e79a87c33068d8dbfd71f2 differ
diff --git a/tests/resources/merge-resolve.git/objects/bd/593285fc7fe4ca18ccdbabf027f5d689101452 b/tests/resources/merge-resolve.git/objects/bd/593285fc7fe4ca18ccdbabf027f5d689101452
new file mode 100644
index 0000000..75ab1f0
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/bd/593285fc7fe4ca18ccdbabf027f5d689101452 differ
diff --git a/tests/resources/merge-resolve.git/objects/bd/867fbae2faa80b920b002b80b1c91bcade7784 b/tests/resources/merge-resolve.git/objects/bd/867fbae2faa80b920b002b80b1c91bcade7784
new file mode 100644
index 0000000..0f74219
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/bd/867fbae2faa80b920b002b80b1c91bcade7784 differ
diff --git a/tests/resources/merge-resolve.git/objects/bd/9cb4cd0a770cb9adcb5fce212142ef40ea1c35 b/tests/resources/merge-resolve.git/objects/bd/9cb4cd0a770cb9adcb5fce212142ef40ea1c35
new file mode 100644
index 0000000..2aafdc6
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/bd/9cb4cd0a770cb9adcb5fce212142ef40ea1c35 differ
diff --git a/tests/resources/merge-resolve.git/objects/be/f6e37b3ee632ba74159168836f382fed21d77d b/tests/resources/merge-resolve.git/objects/be/f6e37b3ee632ba74159168836f382fed21d77d
new file mode 100644
index 0000000..6c24315
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/be/f6e37b3ee632ba74159168836f382fed21d77d
@@ -0,0 +1,2 @@
+x¥K
+1D]ç}¥»3?AÄ7p?ô$=Œ`Ò‰x}GñîªÞƒª`)Ý+0Ñ®Uhú.N“WÆÞ“!ÆÐIdl¦™øØjë<ëb®ñ%%Âm±´Z†“nô“.ú¿v–Î@¾Cdjy€=ˆn£ÛyÕ?g\Ñ,IÇ`y~ÜC %]«÷½¿H&
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/c0/6a9be584ac49aa02c5551312d9e2982c91df10 b/tests/resources/merge-resolve.git/objects/c0/6a9be584ac49aa02c5551312d9e2982c91df10
new file mode 100644
index 0000000..963ef23
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/c0/6a9be584ac49aa02c5551312d9e2982c91df10 differ
diff --git a/tests/resources/merge-resolve.git/objects/c1/b17981db0840109a820dae8674ee29684134ff b/tests/resources/merge-resolve.git/objects/c1/b17981db0840109a820dae8674ee29684134ff
new file mode 100644
index 0000000..fdcf28c
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/c1/b17981db0840109a820dae8674ee29684134ff differ
diff --git a/tests/resources/merge-resolve.git/objects/c1/b6a51bbb87c2f82b161412c3d20b59fc69b090 b/tests/resources/merge-resolve.git/objects/c1/b6a51bbb87c2f82b161412c3d20b59fc69b090
new file mode 100644
index 0000000..3b369f8
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/c1/b6a51bbb87c2f82b161412c3d20b59fc69b090 differ
diff --git a/tests/resources/merge-resolve.git/objects/c3/5dee9bcc0e989f3b0c40f68372a9a51b6c4e6a b/tests/resources/merge-resolve.git/objects/c3/5dee9bcc0e989f3b0c40f68372a9a51b6c4e6a
new file mode 100644
index 0000000..d22b3b2
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/c3/5dee9bcc0e989f3b0c40f68372a9a51b6c4e6a differ
diff --git a/tests/resources/merge-resolve.git/objects/c3/d02eeef75183df7584d8d13ac03053910c1301 b/tests/resources/merge-resolve.git/objects/c3/d02eeef75183df7584d8d13ac03053910c1301
new file mode 100644
index 0000000..2294f01
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/c3/d02eeef75183df7584d8d13ac03053910c1301 differ
diff --git a/tests/resources/merge-resolve.git/objects/c4/efe31e9decccc8b2b4d3df9aac2cdfe2995618 b/tests/resources/merge-resolve.git/objects/c4/efe31e9decccc8b2b4d3df9aac2cdfe2995618
new file mode 100644
index 0000000..c7572d5
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/c4/efe31e9decccc8b2b4d3df9aac2cdfe2995618 differ
diff --git a/tests/resources/merge-resolve.git/objects/c5/0d0f1cb60b8b0fe1615ad20ace557e9d68d7bd b/tests/resources/merge-resolve.git/objects/c5/0d0f1cb60b8b0fe1615ad20ace557e9d68d7bd
new file mode 100644
index 0000000..a1d5321
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/c5/0d0f1cb60b8b0fe1615ad20ace557e9d68d7bd
@@ -0,0 +1 @@
+x¥ŽKj1D³Ö)t˜–4ê–À˜l|ï>-f ‚¯ 9äÞU½‚â¥Vë6¤¶ô1:³Ì¸èè‰ !ÆüÀå>Z.¼P…0“x„Îû‘ ²¡h˜ÑèhQÖ+tÎ`1NÎZe¢,ÂÏX[—×ü =ËÛÚêÑvyæI_é‹ÿ†ÿvJ^¤2 í$?ÁˆI§ìà7oÄ4•ï©íå{Kã>VÞú!~|”U=
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/c5/bbe550b9f09444bdddd3ecf3d97c0b42aa786c b/tests/resources/merge-resolve.git/objects/c5/bbe550b9f09444bdddd3ecf3d97c0b42aa786c
new file mode 100644
index 0000000..2f2ada7
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/c5/bbe550b9f09444bdddd3ecf3d97c0b42aa786c differ
diff --git a/tests/resources/merge-resolve.git/objects/c6/07fc30883e335def28cd686b51f6cfa02b06ec b/tests/resources/merge-resolve.git/objects/c6/07fc30883e335def28cd686b51f6cfa02b06ec
new file mode 100644
index 0000000..475b87e
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/c6/07fc30883e335def28cd686b51f6cfa02b06ec
@@ -0,0 +1,2 @@
+x¥Q
+1 Dýî)r%±›n "þx/m[°[¨¯ooàßÌ{0k)¹…i×›*`â£ZavJ>,‚aò¢ìf<EZÈÍÉȳ¯µÁ5½¤%¸µ<ê' ô“.ú¿vˆµœ,;ë]€=2¢tœwýsÆä-÷,wóÊ8@°
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/c6/92ecf62007c0ac9fb26e2aa884de2933de15ed b/tests/resources/merge-resolve.git/objects/c6/92ecf62007c0ac9fb26e2aa884de2933de15ed
new file mode 100644
index 0000000..ae430bd
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/c6/92ecf62007c0ac9fb26e2aa884de2933de15ed differ
diff --git a/tests/resources/merge-resolve.git/objects/c8/26ef8b17b5cd2c4a0023f265f3a423b3aa0388 b/tests/resources/merge-resolve.git/objects/c8/26ef8b17b5cd2c4a0023f265f3a423b3aa0388
new file mode 100644
index 0000000..b655d7c
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/c8/26ef8b17b5cd2c4a0023f265f3a423b3aa0388 differ
diff --git a/tests/resources/merge-resolve.git/objects/c8/f06f2e3bb2964174677e91f0abead0e43c9e5d b/tests/resources/merge-resolve.git/objects/c8/f06f2e3bb2964174677e91f0abead0e43c9e5d
new file mode 100644
index 0000000..5dae4c3
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/c8/f06f2e3bb2964174677e91f0abead0e43c9e5d differ
diff --git a/tests/resources/merge-resolve.git/objects/c9/174cef549ec94ecbc43ef03cdc775b4950becb b/tests/resources/merge-resolve.git/objects/c9/174cef549ec94ecbc43ef03cdc775b4950becb
new file mode 100644
index 0000000..da8dba2
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/c9/174cef549ec94ecbc43ef03cdc775b4950becb
@@ -0,0 +1,2 @@
+x¥ŽQ
+Â0DýÎ)rÊf“nSñÇxífCÛHŒx}«xÿfÞÀc¤,˵Y ´kUÕbïò8‚pÔu`%—|@rä3GtBÀ™;W]›‚!‹‡½zß'Í%Q¤iÓdœ€T ?Û\ª=§×d/sY eµÝè'ô;üÚ^Êr´Î÷# l`6ºmú§Æ ßZ7U^e6oVòO´
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/c9/4b27e41064c521120627e07e2035cca1d24ffa b/tests/resources/merge-resolve.git/objects/c9/4b27e41064c521120627e07e2035cca1d24ffa
new file mode 100644
index 0000000..fd1ec9f
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/c9/4b27e41064c521120627e07e2035cca1d24ffa differ
diff --git a/tests/resources/merge-resolve.git/objects/ca/b2cf23998b40f1af2d9d9a756dc9e285a8df4b b/tests/resources/merge-resolve.git/objects/ca/b2cf23998b40f1af2d9d9a756dc9e285a8df4b
new file mode 100644
index 0000000..32ba2aa
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ca/b2cf23998b40f1af2d9d9a756dc9e285a8df4b differ
diff --git a/tests/resources/merge-resolve.git/objects/ca/ff6b7d44973f53e3e0cf31d0d695188b19aec6 b/tests/resources/merge-resolve.git/objects/ca/ff6b7d44973f53e3e0cf31d0d695188b19aec6
new file mode 100644
index 0000000..6d0f600
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ca/ff6b7d44973f53e3e0cf31d0d695188b19aec6 differ
diff --git a/tests/resources/merge-resolve.git/objects/cb/491780d82e46dc88a065b965ab307a038f2bc2 b/tests/resources/merge-resolve.git/objects/cb/491780d82e46dc88a065b965ab307a038f2bc2
new file mode 100644
index 0000000..cf9cd7d
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/cb/491780d82e46dc88a065b965ab307a038f2bc2 differ
diff --git a/tests/resources/merge-resolve.git/objects/cb/6693a788715b82440a54e0eacd19ba9f6ec559 b/tests/resources/merge-resolve.git/objects/cb/6693a788715b82440a54e0eacd19ba9f6ec559
new file mode 100644
index 0000000..e11181a
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/cb/6693a788715b82440a54e0eacd19ba9f6ec559 differ
diff --git a/tests/resources/merge-resolve.git/objects/cc/338e4710c9b257106b8d16d82f86458d5beaf1 b/tests/resources/merge-resolve.git/objects/cc/338e4710c9b257106b8d16d82f86458d5beaf1
new file mode 100644
index 0000000..85b3b81
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/cc/338e4710c9b257106b8d16d82f86458d5beaf1
@@ -0,0 +1,2 @@
+x¥ŽK!]sŠ¾€†æ3`bŒoà »ÉÌ1 Æë‹gpW©E½GÖm€±x]“ˆ˜Èù6d
+û ƒçeaŽÎ‰ç¢µz¥.Ï ¬ŽDv Ù[êhŽ¥äD³[´Jﱶwþ¤ÎðX[ÝÛ.2ínu£ÞöVƉZ½Ú³F´!x8ê8÷¦G‡ü‘PÂÛP_’?KN
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f b/tests/resources/merge-resolve.git/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f
new file mode 100644
index 0000000..9a0cb7a
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/cc/3e3009134cb88014129fc8858d1101359e5e2f
@@ -0,0 +1,2 @@
+x¥Ž]
+Â0„}Î)ö•Íß&_¼H“
-ØFbÔë[Åø6ó}0LªË2wPÆìzc†’Ë*“sXbö ‚
Rt”®#Gë$‰[l¼vH„®$ÞkÖÚf.ʧLžF+ ¥QHœD|ô©68çWl.S]îu…oô“Nü¿¶Ou9‚ÔVa0^ZÅF·³ÿœ½ÍÏ9^#Þ
ØOd
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/cd/3e8d4aa06bdc781f264171030bc28f2b370fee b/tests/resources/merge-resolve.git/objects/cd/3e8d4aa06bdc781f264171030bc28f2b370fee
new file mode 100644
index 0000000..144225d
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/cd/3e8d4aa06bdc781f264171030bc28f2b370fee differ
diff --git a/tests/resources/merge-resolve.git/objects/ce/8860d49e3bea6fd745874a01b7c3e46da8cbc3 b/tests/resources/merge-resolve.git/objects/ce/8860d49e3bea6fd745874a01b7c3e46da8cbc3
new file mode 100644
index 0000000..860f995
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ce/8860d49e3bea6fd745874a01b7c3e46da8cbc3 differ
diff --git a/tests/resources/merge-resolve.git/objects/ce/e656c392ad0557b3aae0fb411475c206e2926f b/tests/resources/merge-resolve.git/objects/ce/e656c392ad0557b3aae0fb411475c206e2926f
new file mode 100644
index 0000000..ff0624c
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ce/e656c392ad0557b3aae0fb411475c206e2926f differ
diff --git a/tests/resources/merge-resolve.git/objects/cf/8c5cc8a85a1ff5a4ba51e0bc7cf5665669924d b/tests/resources/merge-resolve.git/objects/cf/8c5cc8a85a1ff5a4ba51e0bc7cf5665669924d
new file mode 100644
index 0000000..36b0289
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/cf/8c5cc8a85a1ff5a4ba51e0bc7cf5665669924d differ
diff --git a/tests/resources/merge-resolve.git/objects/d0/7ec190c306ec690bac349e87d01c4358e49bb2 b/tests/resources/merge-resolve.git/objects/d0/7ec190c306ec690bac349e87d01c4358e49bb2
new file mode 100644
index 0000000..d52a56f
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/d0/7ec190c306ec690bac349e87d01c4358e49bb2
@@ -0,0 +1,2 @@
+xÕ±
€0 ©™Â3¤ažObˆ%Ç‘ S°=HTŒ@u:]uYG¦´¥%šLÚE™ –;¸’uÌ`_?gŒÎ~0²òßÒ”.
+׋Pëû£ÓœñxvXië
Óf!
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/d0/d4594e16f2e19107e3fa7ea63e7aaaff305ffb b/tests/resources/merge-resolve.git/objects/d0/d4594e16f2e19107e3fa7ea63e7aaaff305ffb
new file mode 100644
index 0000000..5f7e286
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/d0/d4594e16f2e19107e3fa7ea63e7aaaff305ffb differ
diff --git a/tests/resources/merge-resolve.git/objects/d2/f8637f2eab2507a1e13cbc9df4729ec386627e b/tests/resources/merge-resolve.git/objects/d2/f8637f2eab2507a1e13cbc9df4729ec386627e
new file mode 100644
index 0000000..558a851
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/d2/f8637f2eab2507a1e13cbc9df4729ec386627e differ
diff --git a/tests/resources/merge-resolve.git/objects/d3/3cedf513c059e0515653fa2c2e386631387a05 b/tests/resources/merge-resolve.git/objects/d3/3cedf513c059e0515653fa2c2e386631387a05
new file mode 100644
index 0000000..d6d4c2b
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/d3/3cedf513c059e0515653fa2c2e386631387a05 differ
diff --git a/tests/resources/merge-resolve.git/objects/d3/719a5ae8e4d92276b5313ce976f6ee5af2b436 b/tests/resources/merge-resolve.git/objects/d3/719a5ae8e4d92276b5313ce976f6ee5af2b436
new file mode 100644
index 0000000..930bf5a
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/d3/719a5ae8e4d92276b5313ce976f6ee5af2b436
@@ -0,0 +1,2 @@
+x=1Â0 E™}Š¿uAH…بÄ
z‡¸ÔRHP Ô Ÿ´T –¿÷ìBrh/ç]?ªaÐ ˜48¡,‘_â¡MúdköÄуTPF!«î¯±÷›TïZµQ?
+RÖ§F«Në™ÕÊÒ_J͆ÃÔ Øh’ª{Ÿßò(kÒËLKV1p–+Q‹ê ÑÕÝÑ® A×
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/d3/7aa3bbfe1c0c49b909781251b956dbabe85f96 b/tests/resources/merge-resolve.git/objects/d3/7aa3bbfe1c0c49b909781251b956dbabe85f96
new file mode 100644
index 0000000..5902e0f
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/d3/7aa3bbfe1c0c49b909781251b956dbabe85f96 differ
diff --git a/tests/resources/merge-resolve.git/objects/d3/7ad72a2052685fc6201c2af90103ad42d2079b b/tests/resources/merge-resolve.git/objects/d3/7ad72a2052685fc6201c2af90103ad42d2079b
new file mode 100644
index 0000000..b2f39bf
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/d3/7ad72a2052685fc6201c2af90103ad42d2079b differ
diff --git a/tests/resources/merge-resolve.git/objects/d4/207f77243500bec335ab477f9227fcdb1e271a b/tests/resources/merge-resolve.git/objects/d4/207f77243500bec335ab477f9227fcdb1e271a
new file mode 100644
index 0000000..862e4e5
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/d4/207f77243500bec335ab477f9227fcdb1e271a
@@ -0,0 +1,2 @@
+x¥ŽK
+1D]ç¹€’O'™7ÞÀ½t:ÝŒ‹™H&âõ Ÿ«zŠ¢:Ï÷® Ä]oÌZÀBñBXlô(ƒƒ “æ˜+d<"«6^ºÎ%ŒÞ
A( ¡ ˆJÆ,Æ% %£5‚SøìSmúR^ØŠ¾Nu^뢼ÑO:óWüÚê|ÒÖ ÆèôÞDcÔF·³ÿœQEn¸¯½6õÔ#Qç
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/d4/27e0b2e138501a3d15cc376077a3631e15bd46 b/tests/resources/merge-resolve.git/objects/d4/27e0b2e138501a3d15cc376077a3631e15bd46
new file mode 100644
index 0000000..0b3611a
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/d4/27e0b2e138501a3d15cc376077a3631e15bd46 differ
diff --git a/tests/resources/merge-resolve.git/objects/d5/093787ef302b941b6aab081b99fb4880038bd8 b/tests/resources/merge-resolve.git/objects/d5/093787ef302b941b6aab081b99fb4880038bd8
new file mode 100644
index 0000000..7d73449
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/d5/093787ef302b941b6aab081b99fb4880038bd8 differ
diff --git a/tests/resources/merge-resolve.git/objects/d5/a61b0b4992a4f0caa887fa08b52431e727bb6f b/tests/resources/merge-resolve.git/objects/d5/a61b0b4992a4f0caa887fa08b52431e727bb6f
new file mode 100644
index 0000000..a7921de
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/d5/a61b0b4992a4f0caa887fa08b52431e727bb6f differ
diff --git a/tests/resources/merge-resolve.git/objects/d5/b6fc965c926a1bfc9ee456042b94088b5c5d21 b/tests/resources/merge-resolve.git/objects/d5/b6fc965c926a1bfc9ee456042b94088b5c5d21
new file mode 100644
index 0000000..924bdbb
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/d5/b6fc965c926a1bfc9ee456042b94088b5c5d21 differ
diff --git a/tests/resources/merge-resolve.git/objects/d5/ec1152fe25e9fec00189eb00b3db71db24c218 b/tests/resources/merge-resolve.git/objects/d5/ec1152fe25e9fec00189eb00b3db71db24c218
new file mode 100644
index 0000000..0d2534b
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/d5/ec1152fe25e9fec00189eb00b3db71db24c218 differ
diff --git a/tests/resources/merge-resolve.git/objects/d6/42b9770c66bba94a08df09b5efb095001f76d7 b/tests/resources/merge-resolve.git/objects/d6/42b9770c66bba94a08df09b5efb095001f76d7
new file mode 100644
index 0000000..1671f9f
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/d6/42b9770c66bba94a08df09b5efb095001f76d7 differ
diff --git a/tests/resources/merge-resolve.git/objects/d6/462fa3f5292857db599c54aea2bf91616230c5 b/tests/resources/merge-resolve.git/objects/d6/462fa3f5292857db599c54aea2bf91616230c5
new file mode 100644
index 0000000..baae3f0
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/d6/462fa3f5292857db599c54aea2bf91616230c5 differ
diff --git a/tests/resources/merge-resolve.git/objects/d6/cf6c7741b3316826af1314042550c97ded1d50 b/tests/resources/merge-resolve.git/objects/d6/cf6c7741b3316826af1314042550c97ded1d50
new file mode 100644
index 0000000..8f9ae1f
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/d6/cf6c7741b3316826af1314042550c97ded1d50
@@ -0,0 +1,2 @@
+x¥Q
+1 Dýî)r%µ¦i@Ä oàj›e»…ÚÅë[Åø7ó ̤Zʽƒ¿éMSLB‘Nl°ìm öÑBºÉ~×>×—üŠ-Ãu®åY8ê ŸtÖ¯øµ]ªåÖQaǶèÍ ã¼ëŸ3f]š>b×lÞ(„A]
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/d7/308cc367b2cc23f710834ec1fd8ffbacf1b460 b/tests/resources/merge-resolve.git/objects/d7/308cc367b2cc23f710834ec1fd8ffbacf1b460
new file mode 100644
index 0000000..b02cda4
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/d7/308cc367b2cc23f710834ec1fd8ffbacf1b460
@@ -0,0 +1 @@
+x¥K @]sŠ¹€†)ÐÄ7ÞÀ ð™¦]ÐI(Æx{ñ î^Þâ½,µn лSoÌ`¬/¹Xä)Ù™B@GžÃ”¸œaòD¼ «øê«4x”wlž«ÔCv¸ò°?º×-79dé—,õh‚F4Žœµ×Z
;ÆÿH¨´í±}Ô·š=
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/d8/74671ef5b20184836cb983bb273e5280384d0b b/tests/resources/merge-resolve.git/objects/d8/74671ef5b20184836cb983bb273e5280384d0b
new file mode 100644
index 0000000..1d80378
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/d8/74671ef5b20184836cb983bb273e5280384d0b differ
diff --git a/tests/resources/merge-resolve.git/objects/d8/dec75ff2f8b41d1c5bfef0cd57b7300c834f66 b/tests/resources/merge-resolve.git/objects/d8/dec75ff2f8b41d1c5bfef0cd57b7300c834f66
new file mode 100644
index 0000000..74f807e
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/d8/dec75ff2f8b41d1c5bfef0cd57b7300c834f66 differ
diff --git a/tests/resources/merge-resolve.git/objects/d8/fa77b6833082c1ea36b7828a582d4c43882450 b/tests/resources/merge-resolve.git/objects/d8/fa77b6833082c1ea36b7828a582d4c43882450
new file mode 100644
index 0000000..9881453
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/d8/fa77b6833082c1ea36b7828a582d4c43882450
@@ -0,0 +1 @@
+xíÐ1€ DQkN1¥–&6 ‡•%l²BkŒ·naa1Åk¦ø¤…°íëdI¢(ãU£rö'7‰‘»LŸ’AÅ,±+Wmð9 ŒI'UŸÄ͹ÿñ£ _ÛÜ°N
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/d9/63979c237d08b6ba39062ee7bf64c7d34a27f8 b/tests/resources/merge-resolve.git/objects/d9/63979c237d08b6ba39062ee7bf64c7d34a27f8
new file mode 100644
index 0000000..5fa1040
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/d9/63979c237d08b6ba39062ee7bf64c7d34a27f8 differ
diff --git a/tests/resources/merge-resolve.git/objects/da/178208145ef585a1bd5ca5f4c9785d738df2cf b/tests/resources/merge-resolve.git/objects/da/178208145ef585a1bd5ca5f4c9785d738df2cf
new file mode 100644
index 0000000..6292118
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/da/178208145ef585a1bd5ca5f4c9785d738df2cf differ
diff --git a/tests/resources/merge-resolve.git/objects/db/6261a7c65c7fd678520c9bb6f2c47582ab9ed5 b/tests/resources/merge-resolve.git/objects/db/6261a7c65c7fd678520c9bb6f2c47582ab9ed5
new file mode 100644
index 0000000..b82e7fc
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/db/6261a7c65c7fd678520c9bb6f2c47582ab9ed5 differ
diff --git a/tests/resources/merge-resolve.git/objects/dd/2ae5ab264e5592aa754235d5ad5eac8f0ecdfd b/tests/resources/merge-resolve.git/objects/dd/2ae5ab264e5592aa754235d5ad5eac8f0ecdfd
new file mode 100644
index 0000000..55626a5
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/dd/2ae5ab264e5592aa754235d5ad5eac8f0ecdfd differ
diff --git a/tests/resources/merge-resolve.git/objects/dd/9a570c3400e6e07bc4d7651d6e20b08926b3d9 b/tests/resources/merge-resolve.git/objects/dd/9a570c3400e6e07bc4d7651d6e20b08926b3d9
new file mode 100644
index 0000000..8fd60cb
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/dd/9a570c3400e6e07bc4d7651d6e20b08926b3d9 differ
diff --git a/tests/resources/merge-resolve.git/objects/de/872ee3618b894992e9d1e18ba2ebe256a112f9 b/tests/resources/merge-resolve.git/objects/de/872ee3618b894992e9d1e18ba2ebe256a112f9
new file mode 100644
index 0000000..04dda4a
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/de/872ee3618b894992e9d1e18ba2ebe256a112f9
@@ -0,0 +1 @@
+xí±
À S3Å‚…ŒlK–A†ˆõƒ²BÚ4W®¸b Ÿù˜—T5Á¢:§8ÔS»c€œ±Ô Ô»P`KäI¥Ë†O3Z½•”þàç‡&ØÝ
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/df/e3f22baa1f6fce5447901c3086bae368de6bdd b/tests/resources/merge-resolve.git/objects/df/e3f22baa1f6fce5447901c3086bae368de6bdd
new file mode 100644
index 0000000..e135694
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/df/e3f22baa1f6fce5447901c3086bae368de6bdd differ
diff --git a/tests/resources/merge-resolve.git/objects/e0/67f9361140f19391472df8a82d6610813c73b7 b/tests/resources/merge-resolve.git/objects/e0/67f9361140f19391472df8a82d6610813c73b7
new file mode 100644
index 0000000..955431d
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/e0/67f9361140f19391472df8a82d6610813c73b7 differ
diff --git a/tests/resources/merge-resolve.git/objects/e1/129b3cfb5898e0fbd606e0cb80b2755e50d161 b/tests/resources/merge-resolve.git/objects/e1/129b3cfb5898e0fbd606e0cb80b2755e50d161
new file mode 100644
index 0000000..751f1dd
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/e1/129b3cfb5898e0fbd606e0cb80b2755e50d161 differ
diff --git a/tests/resources/merge-resolve.git/objects/e1/7ace1492648c9dc5701bad5c47af9d1b60c4e9 b/tests/resources/merge-resolve.git/objects/e1/7ace1492648c9dc5701bad5c47af9d1b60c4e9
new file mode 100644
index 0000000..4a812e5
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/e1/7ace1492648c9dc5701bad5c47af9d1b60c4e9 differ
diff --git a/tests/resources/merge-resolve.git/objects/e2/6b8888956137218d8589368a3e606cf50fbb56 b/tests/resources/merge-resolve.git/objects/e2/6b8888956137218d8589368a3e606cf50fbb56
new file mode 100644
index 0000000..d4ec2b9
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/e2/6b8888956137218d8589368a3e606cf50fbb56 differ
diff --git a/tests/resources/merge-resolve.git/objects/e2/c6abbd55fed5ac71a5f2751e29b4a34726a595 b/tests/resources/merge-resolve.git/objects/e2/c6abbd55fed5ac71a5f2751e29b4a34726a595
new file mode 100644
index 0000000..7b84ce9
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/e2/c6abbd55fed5ac71a5f2751e29b4a34726a595
@@ -0,0 +1 @@
+x+)JMU067f040031QH,-ÉÏM-JOMLÊIÕ+©(aH:,»:ÎCÉýúô:ÞË ²o>ZC'g$楧¦èfæé&%æ%g€5¬ÎqYôÂeÒZoÇÝÙkÚMíæ2éÆÔ›X\’ZDPC~^ZNfrIf^:Xéõ› ZHÙŠž1O(_œ,'º×
jvn~JfZ&Ô5ù%·˜º³\N´º¢ÔçÞö§,5[ðe“Ù¨ú¢ÔÜü2 ÇßüI{•|þ¹÷ 2m» gÜ˾‹©Éñ1ÖËåüŠ5Ó¿Ü ,\“µ})TC)0DÀvú‰ùzÖ›¦9–¤×Mü°úÕ…'6ób‹”
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/e3/1e7ad3ed298f24e383c4950f4671993ec078e4 b/tests/resources/merge-resolve.git/objects/e3/1e7ad3ed298f24e383c4950f4671993ec078e4
new file mode 100644
index 0000000..a28ded3
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/e3/1e7ad3ed298f24e383c4950f4671993ec078e4 differ
diff --git a/tests/resources/merge-resolve.git/objects/e3/76fbdd06ebf021c92724da9f26f44212734e3e b/tests/resources/merge-resolve.git/objects/e3/76fbdd06ebf021c92724da9f26f44212734e3e
new file mode 100644
index 0000000..8da2341
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/e3/76fbdd06ebf021c92724da9f26f44212734e3e
@@ -0,0 +1,3 @@
+xíAÂ@E]s
+`ö@Ì uHš)M=¾Scô®Üþü’zÂé:¢ÊŠ³(ãN+6Þ›D°¡Feð˜Y®g$+GˆÞä&F
+Ÿ½ì‹p‡þâG —4”mQÉ\±á85Æ#FìCð¥ï~QEóÀÄÀÚR—š½u)£;cáà â6üöë'ÍjÄÇ
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/e4/9f917b448d1340b31d76e54ba388268fd4c922 b/tests/resources/merge-resolve.git/objects/e4/9f917b448d1340b31d76e54ba388268fd4c922
new file mode 100644
index 0000000..870c3e7
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/e4/9f917b448d1340b31d76e54ba388268fd4c922 differ
diff --git a/tests/resources/merge-resolve.git/objects/e4/f618a2c3ed0669308735727df5ebf2447f022f b/tests/resources/merge-resolve.git/objects/e4/f618a2c3ed0669308735727df5ebf2447f022f
new file mode 100644
index 0000000..c7e1ee9
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/e4/f618a2c3ed0669308735727df5ebf2447f022f
@@ -0,0 +1,2 @@
+x¥ŽK!D]s
+. išObŒoà i2. b¼¾h¼»ª÷’JQ«õ6äb`7:³DN.%•±œ4¹’u¦‹ÏÄIQñYÜcçmÈà Ù`Q¨ aQYa¶@>äÄÉ—Ecñ9ÖÖå%¿bÏòº¶úh›<ò¤Ÿtæ¯øµµz’J£òÁ(¹“γƒÿœFCñ_‹NŒ
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/e5/060729746ca9888239cba08fdcf4bee907b406 b/tests/resources/merge-resolve.git/objects/e5/060729746ca9888239cba08fdcf4bee907b406
new file mode 100644
index 0000000..33299c2
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/e5/060729746ca9888239cba08fdcf4bee907b406 differ
diff --git a/tests/resources/merge-resolve.git/objects/e6/5a9bb2af9f4c2d1c375dd0f8f8a46cf9c68812 b/tests/resources/merge-resolve.git/objects/e6/5a9bb2af9f4c2d1c375dd0f8f8a46cf9c68812
new file mode 100644
index 0000000..72f1cbc
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/e6/5a9bb2af9f4c2d1c375dd0f8f8a46cf9c68812 differ
diff --git a/tests/resources/merge-resolve.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 b/tests/resources/merge-resolve.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
new file mode 100644
index 0000000..7112238
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 differ
diff --git a/tests/resources/merge-resolve.git/objects/e8/107f24196736b870a318a0e28f048e29f6feff b/tests/resources/merge-resolve.git/objects/e8/107f24196736b870a318a0e28f048e29f6feff
new file mode 100644
index 0000000..ffcf843
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/e8/107f24196736b870a318a0e28f048e29f6feff
@@ -0,0 +1,3 @@
+x¥ŽK!D]s
+. i~=LbŒoàÞ@ÓdfãõEã
ÜU½—TŠj)k—Úš]oÌÒ¯mð„èü„ž5(3ƒÓj&Ô™4Íâß»póp™iRI;‘³·¨“Â9Ò‚²Q„g_j“—ô
+-ÉëRËVïòȃ~Ò™¿â×TËI*ãÜtr g;ÿ9#R¾mkb%ÞrLNÁ
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/e9/2cdb7017dc6c5aed25cb4202c5b0104b872246 b/tests/resources/merge-resolve.git/objects/e9/2cdb7017dc6c5aed25cb4202c5b0104b872246
new file mode 100644
index 0000000..cb1260e
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/e9/2cdb7017dc6c5aed25cb4202c5b0104b872246 differ
diff --git a/tests/resources/merge-resolve.git/objects/e9/ad6ec3e38364a3d07feda7c4197d4d845c53b5 b/tests/resources/merge-resolve.git/objects/e9/ad6ec3e38364a3d07feda7c4197d4d845c53b5
new file mode 100644
index 0000000..da4a5ed
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/e9/ad6ec3e38364a3d07feda7c4197d4d845c53b5 differ
diff --git a/tests/resources/merge-resolve.git/objects/e9/f48beccc62d535739bfbdebe0a55ed716d8366 b/tests/resources/merge-resolve.git/objects/e9/f48beccc62d535739bfbdebe0a55ed716d8366
new file mode 100644
index 0000000..23c59e4
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/e9/f48beccc62d535739bfbdebe0a55ed716d8366 differ
diff --git a/tests/resources/merge-resolve.git/objects/eb/c09d0137cfb0c26697aed0109fb943ad906f3f b/tests/resources/merge-resolve.git/objects/eb/c09d0137cfb0c26697aed0109fb943ad906f3f
new file mode 100644
index 0000000..83b489d
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/eb/c09d0137cfb0c26697aed0109fb943ad906f3f differ
diff --git a/tests/resources/merge-resolve.git/objects/ec/67e5a86adff465359f1c8f995e12dbdfa08d8a b/tests/resources/merge-resolve.git/objects/ec/67e5a86adff465359f1c8f995e12dbdfa08d8a
new file mode 100644
index 0000000..8490346
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ec/67e5a86adff465359f1c8f995e12dbdfa08d8a differ
diff --git a/tests/resources/merge-resolve.git/objects/ed/9523e62e453e50dd9be1606af19399b96e397a b/tests/resources/merge-resolve.git/objects/ed/9523e62e453e50dd9be1606af19399b96e397a
new file mode 100644
index 0000000..7853e23
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ed/9523e62e453e50dd9be1606af19399b96e397a differ
diff --git a/tests/resources/merge-resolve.git/objects/ee/1d6f164893c1866a323f072eeed36b855656be b/tests/resources/merge-resolve.git/objects/ee/1d6f164893c1866a323f072eeed36b855656be
new file mode 100644
index 0000000..87d8080
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ee/1d6f164893c1866a323f072eeed36b855656be differ
diff --git a/tests/resources/merge-resolve.git/objects/ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf b/tests/resources/merge-resolve.git/objects/ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf
new file mode 100644
index 0000000..974b72d
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ee/3fa1b8c00aff7fe02065fdb50864bb0d932ccf differ
diff --git a/tests/resources/merge-resolve.git/objects/ee/a9286df54245fea72c5b557291470eb825f38f b/tests/resources/merge-resolve.git/objects/ee/a9286df54245fea72c5b557291470eb825f38f
new file mode 100644
index 0000000..ead0b2c
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ee/a9286df54245fea72c5b557291470eb825f38f differ
diff --git a/tests/resources/merge-resolve.git/objects/ef/58fdd8086c243bdc81f99e379acacfd21d32d6 b/tests/resources/merge-resolve.git/objects/ef/58fdd8086c243bdc81f99e379acacfd21d32d6
new file mode 100644
index 0000000..55f79e0
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/ef/58fdd8086c243bdc81f99e379acacfd21d32d6
@@ -0,0 +1,2 @@
+x
ÉÁ À0Оâï:JŠB¢ÝŸæôOV
+Þñ´yáó5éê† 5jã†q!’4÷Î{¡³:ýp;¼
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/ef/c499524cf105d5264ac7fc54e07e95764e8075 b/tests/resources/merge-resolve.git/objects/ef/c499524cf105d5264ac7fc54e07e95764e8075
new file mode 100644
index 0000000..bc9350b
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ef/c499524cf105d5264ac7fc54e07e95764e8075 differ
diff --git a/tests/resources/merge-resolve.git/objects/ef/c9121fdedaf08ba180b53ebfbcf71bd488ed09 b/tests/resources/merge-resolve.git/objects/ef/c9121fdedaf08ba180b53ebfbcf71bd488ed09
new file mode 100644
index 0000000..5f9cd30
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ef/c9121fdedaf08ba180b53ebfbcf71bd488ed09 differ
diff --git a/tests/resources/merge-resolve.git/objects/f0/053b8060bb3f0be5cbcc3147a07ece26bf097e b/tests/resources/merge-resolve.git/objects/f0/053b8060bb3f0be5cbcc3147a07ece26bf097e
new file mode 100644
index 0000000..c63d37f
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/f0/053b8060bb3f0be5cbcc3147a07ece26bf097e differ
diff --git a/tests/resources/merge-resolve.git/objects/f0/ce2b8e4986084d9b308fb72709e414c23eb5e6 b/tests/resources/merge-resolve.git/objects/f0/ce2b8e4986084d9b308fb72709e414c23eb5e6
new file mode 100644
index 0000000..e78c19f
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/f0/ce2b8e4986084d9b308fb72709e414c23eb5e6 differ
diff --git a/tests/resources/merge-resolve.git/objects/f2/0c9063fa0bda9a397c96947a7b687305c49753 b/tests/resources/merge-resolve.git/objects/f2/0c9063fa0bda9a397c96947a7b687305c49753
new file mode 100644
index 0000000..34d9aed
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/f2/0c9063fa0bda9a397c96947a7b687305c49753 differ
diff --git a/tests/resources/merge-resolve.git/objects/f2/9e7fb590551095230c6149cbe72f2e9104a796 b/tests/resources/merge-resolve.git/objects/f2/9e7fb590551095230c6149cbe72f2e9104a796
new file mode 100644
index 0000000..663f6ae
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/f2/9e7fb590551095230c6149cbe72f2e9104a796 differ
diff --git a/tests/resources/merge-resolve.git/objects/f2/e1550a0c9e53d5811175864a29536642ae3821 b/tests/resources/merge-resolve.git/objects/f2/e1550a0c9e53d5811175864a29536642ae3821
new file mode 100644
index 0000000..1fdcbe2
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/f2/e1550a0c9e53d5811175864a29536642ae3821 differ
diff --git a/tests/resources/merge-resolve.git/objects/f3/293571dcd708b6a3faf03818cd2844d000e198 b/tests/resources/merge-resolve.git/objects/f3/293571dcd708b6a3faf03818cd2844d000e198
new file mode 100644
index 0000000..f748743
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/f3/293571dcd708b6a3faf03818cd2844d000e198
@@ -0,0 +1 @@
+x¥ŽKjÄ0³Ö)údµZ !›¹Á\@nIعƒ,3× Í²{¼¢XZÛë?F/\Eã12zcó’©"#êX1§]µÚ[Ô_êå˜GŒ&™œ˜c©+9³‡” ùXWKÁÓžiUé›t¸çgê ›´Sø*“¾×OÛ¹Ë)u|²´oXp*" pÓ¤µšt†Žò…šÅ©`9êïÎäê§zÅKO\
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/f3/f1164b68b57b1995b658a828320e6df3081fae b/tests/resources/merge-resolve.git/objects/f3/f1164b68b57b1995b658a828320e6df3081fae
new file mode 100644
index 0000000..5f0b4e4
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/f3/f1164b68b57b1995b658a828320e6df3081fae differ
diff --git a/tests/resources/merge-resolve.git/objects/f4/15caf3fcad16304cb424b67f0ee6b12dc03aae b/tests/resources/merge-resolve.git/objects/f4/15caf3fcad16304cb424b67f0ee6b12dc03aae
new file mode 100644
index 0000000..21ce1a0
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/f4/15caf3fcad16304cb424b67f0ee6b12dc03aae differ
diff --git a/tests/resources/merge-resolve.git/objects/f4/8097eb340dc5a7cae55aabcf1faf4548aa821f b/tests/resources/merge-resolve.git/objects/f4/8097eb340dc5a7cae55aabcf1faf4548aa821f
new file mode 100644
index 0000000..5a4a9a5
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/f4/8097eb340dc5a7cae55aabcf1faf4548aa821f differ
diff --git a/tests/resources/merge-resolve.git/objects/f5/504f36e6f4eb797a56fc5bac6c6c7f32969bf2 b/tests/resources/merge-resolve.git/objects/f5/504f36e6f4eb797a56fc5bac6c6c7f32969bf2
new file mode 100644
index 0000000..2aa0c3b
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/f5/504f36e6f4eb797a56fc5bac6c6c7f32969bf2 differ
diff --git a/tests/resources/merge-resolve.git/objects/f5/b50c85a87cac64d7eb3254cdd1aec9564c0293 b/tests/resources/merge-resolve.git/objects/f5/b50c85a87cac64d7eb3254cdd1aec9564c0293
new file mode 100644
index 0000000..c1885cb
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/f5/b50c85a87cac64d7eb3254cdd1aec9564c0293 differ
diff --git a/tests/resources/merge-resolve.git/objects/f5/f9dd5886a6ee20272be0aafc790cba43b31931 b/tests/resources/merge-resolve.git/objects/f5/f9dd5886a6ee20272be0aafc790cba43b31931
new file mode 100644
index 0000000..17ad506
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/f5/f9dd5886a6ee20272be0aafc790cba43b31931 differ
diff --git a/tests/resources/merge-resolve.git/objects/f6/65b45cde9b568009c6e6b7b568e89cfe717df8 b/tests/resources/merge-resolve.git/objects/f6/65b45cde9b568009c6e6b7b568e89cfe717df8
new file mode 100644
index 0000000..7af50d7
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/f6/65b45cde9b568009c6e6b7b568e89cfe717df8 differ
diff --git a/tests/resources/merge-resolve.git/objects/f6/be049e284c0f9dcbbc745543885be3502ea521 b/tests/resources/merge-resolve.git/objects/f6/be049e284c0f9dcbbc745543885be3502ea521
new file mode 100644
index 0000000..12d3c25
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/f6/be049e284c0f9dcbbc745543885be3502ea521 differ
diff --git a/tests/resources/merge-resolve.git/objects/f7/c332bd4d4d4b777366cae4d24d1687477576bf b/tests/resources/merge-resolve.git/objects/f7/c332bd4d4d4b777366cae4d24d1687477576bf
new file mode 100644
index 0000000..b36bcea
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/f7/c332bd4d4d4b777366cae4d24d1687477576bf differ
diff --git a/tests/resources/merge-resolve.git/objects/f8/958bdf4d365a84a9a178b1f5f35ff1dacbd884 b/tests/resources/merge-resolve.git/objects/f8/958bdf4d365a84a9a178b1f5f35ff1dacbd884
new file mode 100644
index 0000000..5dbbef2
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/f8/958bdf4d365a84a9a178b1f5f35ff1dacbd884
@@ -0,0 +1,2 @@
+x¥ŽK
+1D]ç}¥ÓI¦qã
ÜK> f1’‰x}£xwU¯àQ±–²v kv½‰@`OŽ§<çHˆd}œ%kŽA›‘CÒ>²ÑÄêá›Ü;$KÈ™y bhŒóÁ2癈sLA ±öÊ?ûR\ÒË·×¥–Þá(ƒ~ÒY¾Ã¯ b-'ÐÆYÇŽp‚=NˆjÐq¶ËŸ•òm[“zí O+
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/f9/7da95f156121bea8f978623628f4cbdbf30b36 b/tests/resources/merge-resolve.git/objects/f9/7da95f156121bea8f978623628f4cbdbf30b36
new file mode 100644
index 0000000..d785511
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/f9/7da95f156121bea8f978623628f4cbdbf30b36
@@ -0,0 +1 @@
+xŽ1!E9½‰…)Œ±±´óÃ0¸[¬–ׯà¯^^ò’Ïu]—®§) zщ²%ÊÞA). dgˆ¡DðCt“zS“W×dM‹X ²cÁb3gðì/’‚¢½Ïµé[þPËú1×u«/}–at}.}ÞÓ‰ëzÑÖc€Æ¡>š15ìxÙåß^ÝiµúêòHø
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/fa/c03f2c5139618d87d53614c153823bf1f31396 b/tests/resources/merge-resolve.git/objects/fa/c03f2c5139618d87d53614c153823bf1f31396
new file mode 100644
index 0000000..30e07e5
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/fa/c03f2c5139618d87d53614c153823bf1f31396 differ
diff --git a/tests/resources/merge-resolve.git/objects/fa/da9356aa3f74622327a3038ae9c6f92e1c5c1d b/tests/resources/merge-resolve.git/objects/fa/da9356aa3f74622327a3038ae9c6f92e1c5c1d
new file mode 100644
index 0000000..16ce49a
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/fa/da9356aa3f74622327a3038ae9c6f92e1c5c1d differ
diff --git a/tests/resources/merge-resolve.git/objects/fb/738a106cfd097a4acb96ce132ecb1ad6c46b03 b/tests/resources/merge-resolve.git/objects/fb/738a106cfd097a4acb96ce132ecb1ad6c46b03
new file mode 100644
index 0000000..4f1e726
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/fb/738a106cfd097a4acb96ce132ecb1ad6c46b03 differ
diff --git a/tests/resources/merge-resolve.git/objects/fc/4c636d6515e9e261f9260dbcf3cc6eca97ea08 b/tests/resources/merge-resolve.git/objects/fc/4c636d6515e9e261f9260dbcf3cc6eca97ea08
new file mode 100644
index 0000000..be8a810
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/fc/4c636d6515e9e261f9260dbcf3cc6eca97ea08 differ
diff --git a/tests/resources/merge-resolve.git/objects/fc/7d7b805f7a9428574f4f802b2e34cd20ab9d99 b/tests/resources/merge-resolve.git/objects/fc/7d7b805f7a9428574f4f802b2e34cd20ab9d99
new file mode 100644
index 0000000..20493e6
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/fc/7d7b805f7a9428574f4f802b2e34cd20ab9d99 differ
diff --git a/tests/resources/merge-resolve.git/objects/fc/90237dc4891fa6c69827fc465632225e391618 b/tests/resources/merge-resolve.git/objects/fc/90237dc4891fa6c69827fc465632225e391618
new file mode 100644
index 0000000..961814b
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/fc/90237dc4891fa6c69827fc465632225e391618 differ
diff --git a/tests/resources/merge-resolve.git/objects/fd/57d2d6770fad8e9959124793a17f441b571e66 b/tests/resources/merge-resolve.git/objects/fd/57d2d6770fad8e9959124793a17f441b571e66
new file mode 100644
index 0000000..21e6b2c
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/fd/57d2d6770fad8e9959124793a17f441b571e66 differ
diff --git a/tests/resources/merge-resolve.git/objects/fd/89f8cffb663ac89095a0f9764902e93ceaca6a b/tests/resources/merge-resolve.git/objects/fd/89f8cffb663ac89095a0f9764902e93ceaca6a
new file mode 100644
index 0000000..2f9d83b
--- /dev/null
+++ b/tests/resources/merge-resolve.git/objects/fd/89f8cffb663ac89095a0f9764902e93ceaca6a
@@ -0,0 +1,2 @@
+x¥ŽK!D]s
+. ¡{` cÜx/À§É¸`0 ÆëËoà®êURy±–òèõ|èY`Àd PÌA!±íÜäŒå4C2d=x#ž¾ñÚe`Bgr´™uôàbLÁ‡¬Ðf“fG @þÕ—Úä-½}Kò¾Ô²ÕUžyÐ=]ù;üÚ)Ör‘0 Rˆ$Ê(% ²ÿ¼Ùo=׶›ˆ‡OPw
\ No newline at end of file
diff --git a/tests/resources/merge-resolve.git/objects/fe/5407fc50a53aecb41d1a6e9ea7b612e581af87 b/tests/resources/merge-resolve.git/objects/fe/5407fc50a53aecb41d1a6e9ea7b612e581af87
new file mode 100644
index 0000000..4ce7d22
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/fe/5407fc50a53aecb41d1a6e9ea7b612e581af87 differ
diff --git a/tests/resources/merge-resolve.git/objects/ff/49d07869831ad761bbdaea026086f8789bcb00 b/tests/resources/merge-resolve.git/objects/ff/49d07869831ad761bbdaea026086f8789bcb00
new file mode 100644
index 0000000..eada39b
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ff/49d07869831ad761bbdaea026086f8789bcb00 differ
diff --git a/tests/resources/merge-resolve.git/objects/ff/b312248d607284c290023f9502eea010d34efd b/tests/resources/merge-resolve.git/objects/ff/b312248d607284c290023f9502eea010d34efd
new file mode 100644
index 0000000..7e46c4f
Binary files /dev/null and b/tests/resources/merge-resolve.git/objects/ff/b312248d607284c290023f9502eea010d34efd differ
diff --git a/tests/resources/merge-resolve.git/refs/heads/branch b/tests/resources/merge-resolve.git/refs/heads/branch
new file mode 100644
index 0000000..03f79a3
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/branch
@@ -0,0 +1 @@
+7cb63eed597130ba4abb87b3e544b85021905520
diff --git a/tests/resources/merge-resolve.git/refs/heads/delete-submodule b/tests/resources/merge-resolve.git/refs/heads/delete-submodule
new file mode 100644
index 0000000..1951316
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/delete-submodule
@@ -0,0 +1 @@
+50c5dc8cdfe40c688eb0a0e23be54dd57cae2e78
diff --git a/tests/resources/merge-resolve.git/refs/heads/df_ancestor b/tests/resources/merge-resolve.git/refs/heads/df_ancestor
new file mode 100644
index 0000000..4bc37ac
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/df_ancestor
@@ -0,0 +1 @@
+2da538570bc1e5b2c3e855bf702f35248ad0735f
diff --git a/tests/resources/merge-resolve.git/refs/heads/df_side1 b/tests/resources/merge-resolve.git/refs/heads/df_side1
new file mode 100644
index 0000000..ca6dd67
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/df_side1
@@ -0,0 +1 @@
+a7dbfcbfc1a60709cb80b5ca24539008456531d0
diff --git a/tests/resources/merge-resolve.git/refs/heads/df_side2 b/tests/resources/merge-resolve.git/refs/heads/df_side2
new file mode 100644
index 0000000..b8160f8
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/df_side2
@@ -0,0 +1 @@
+fc90237dc4891fa6c69827fc465632225e391618
diff --git a/tests/resources/merge-resolve.git/refs/heads/ff_branch b/tests/resources/merge-resolve.git/refs/heads/ff_branch
new file mode 100644
index 0000000..e9e9051
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/ff_branch
@@ -0,0 +1 @@
+fd89f8cffb663ac89095a0f9764902e93ceaca6a
diff --git a/tests/resources/merge-resolve.git/refs/heads/master b/tests/resources/merge-resolve.git/refs/heads/master
new file mode 100644
index 0000000..8a329ae
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/master
@@ -0,0 +1 @@
+bd593285fc7fe4ca18ccdbabf027f5d689101452
diff --git a/tests/resources/merge-resolve.git/refs/heads/octo1 b/tests/resources/merge-resolve.git/refs/heads/octo1
new file mode 100644
index 0000000..4d2c669
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/octo1
@@ -0,0 +1 @@
+16f825815cfd20a07a75c71554e82d8eede0b061
diff --git a/tests/resources/merge-resolve.git/refs/heads/octo2 b/tests/resources/merge-resolve.git/refs/heads/octo2
new file mode 100644
index 0000000..f503977
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/octo2
@@ -0,0 +1 @@
+158dc7bedb202f5b26502bf3574faa7f4238d56c
diff --git a/tests/resources/merge-resolve.git/refs/heads/octo3 b/tests/resources/merge-resolve.git/refs/heads/octo3
new file mode 100644
index 0000000..b92994f
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/octo3
@@ -0,0 +1 @@
+50ce7d7d01217679e26c55939eef119e0c93e272
diff --git a/tests/resources/merge-resolve.git/refs/heads/octo4 b/tests/resources/merge-resolve.git/refs/heads/octo4
new file mode 100644
index 0000000..f33d57c
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/octo4
@@ -0,0 +1 @@
+54269b3f6ec3d7d4ede24dd350dd5d605495c3ae
diff --git a/tests/resources/merge-resolve.git/refs/heads/octo5 b/tests/resources/merge-resolve.git/refs/heads/octo5
new file mode 100644
index 0000000..e9f9433
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/octo5
@@ -0,0 +1 @@
+e4f618a2c3ed0669308735727df5ebf2447f022f
diff --git a/tests/resources/merge-resolve.git/refs/heads/octo6 b/tests/resources/merge-resolve.git/refs/heads/octo6
new file mode 100644
index 0000000..4c5a98a
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/octo6
@@ -0,0 +1 @@
+b6f610aef53bd343e6c96227de874c66f00ee8e8
diff --git a/tests/resources/merge-resolve.git/refs/heads/previous b/tests/resources/merge-resolve.git/refs/heads/previous
new file mode 100644
index 0000000..7bc1a8d
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/previous
@@ -0,0 +1 @@
+c607fc30883e335def28cd686b51f6cfa02b06ec
diff --git a/tests/resources/merge-resolve.git/refs/heads/rename_conflict_ancestor b/tests/resources/merge-resolve.git/refs/heads/rename_conflict_ancestor
new file mode 100644
index 0000000..4092d42
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/rename_conflict_ancestor
@@ -0,0 +1 @@
+2392a2dacc9efb562b8635d6579fb458751c7c5b
diff --git a/tests/resources/merge-resolve.git/refs/heads/rename_conflict_ours b/tests/resources/merge-resolve.git/refs/heads/rename_conflict_ours
new file mode 100644
index 0000000..a1c50dc
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/rename_conflict_ours
@@ -0,0 +1 @@
+34bfafff88eaf118402b44e6f3e2dbbf1a582b05
diff --git a/tests/resources/merge-resolve.git/refs/heads/rename_conflict_theirs b/tests/resources/merge-resolve.git/refs/heads/rename_conflict_theirs
new file mode 100644
index 0000000..1309893
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/rename_conflict_theirs
@@ -0,0 +1 @@
+a802e06f1782a9645b9851bc7202cee74a8a4972
diff --git a/tests/resources/merge-resolve.git/refs/heads/renames1 b/tests/resources/merge-resolve.git/refs/heads/renames1
new file mode 100644
index 0000000..3d24810
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/renames1
@@ -0,0 +1 @@
+412b32fb66137366147f1801ecc962452757d48a
diff --git a/tests/resources/merge-resolve.git/refs/heads/renames2 b/tests/resources/merge-resolve.git/refs/heads/renames2
new file mode 100644
index 0000000..d226215
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/renames2
@@ -0,0 +1 @@
+ab40af3cb8a3ed2e2843e96d9aa7871336b94573
diff --git a/tests/resources/merge-resolve.git/refs/heads/submodule_rename1 b/tests/resources/merge-resolve.git/refs/heads/submodule_rename1
new file mode 100644
index 0000000..0ed914f
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/submodule_rename1
@@ -0,0 +1 @@
+f97da95f156121bea8f978623628f4cbdbf30b36
diff --git a/tests/resources/merge-resolve.git/refs/heads/submodule_rename2 b/tests/resources/merge-resolve.git/refs/heads/submodule_rename2
new file mode 100644
index 0000000..8e020cc
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/submodule_rename2
@@ -0,0 +1 @@
+37f53a5a14f64e91089a39ea58e71c87d81df765
diff --git a/tests/resources/merge-resolve.git/refs/heads/submodules b/tests/resources/merge-resolve.git/refs/heads/submodules
new file mode 100644
index 0000000..e5511ec
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/submodules
@@ -0,0 +1 @@
+d8dec75ff2f8b41d1c5bfef0cd57b7300c834f66
diff --git a/tests/resources/merge-resolve.git/refs/heads/submodules-branch b/tests/resources/merge-resolve.git/refs/heads/submodules-branch
new file mode 100644
index 0000000..7d47e07
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/submodules-branch
@@ -0,0 +1 @@
+811c70fcb6d5bbd022d04cc31836d30b436f9551
diff --git a/tests/resources/merge-resolve.git/refs/heads/submodules-branch2 b/tests/resources/merge-resolve.git/refs/heads/submodules-branch2
new file mode 100644
index 0000000..ced60d8
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/submodules-branch2
@@ -0,0 +1 @@
+7c04ca611203ed320c5f495b9813054dd23be3be
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-10 b/tests/resources/merge-resolve.git/refs/heads/trivial-10
new file mode 100644
index 0000000..5b378cd
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-10
@@ -0,0 +1 @@
+0ec5f433959cd46177f745903353efb5be08d151
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-10-branch b/tests/resources/merge-resolve.git/refs/heads/trivial-10-branch
new file mode 100644
index 0000000..b3db6c8
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-10-branch
@@ -0,0 +1 @@
+11f4f3c08b737f5fd896cbefa1425ee63b21b2fa
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-11 b/tests/resources/merge-resolve.git/refs/heads/trivial-11
new file mode 100644
index 0000000..154de9a
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-11
@@ -0,0 +1 @@
+3168dca1a561889b045a6441909f4c56145e666d
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-11-branch b/tests/resources/merge-resolve.git/refs/heads/trivial-11-branch
new file mode 100644
index 0000000..2e41180
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-11-branch
@@ -0,0 +1 @@
+6718a45909532d1fcf5600d0877f7fe7e78f0b86
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-13 b/tests/resources/merge-resolve.git/refs/heads/trivial-13
new file mode 100644
index 0000000..297573a
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-13
@@ -0,0 +1 @@
+a3fabece9eb8748da810e1e08266fef9b7136ad4
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-13-branch b/tests/resources/merge-resolve.git/refs/heads/trivial-13-branch
new file mode 100644
index 0000000..22e429a
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-13-branch
@@ -0,0 +1 @@
+05f3c1a2a56ca95c3d2ef28dc9ddf32b5cd6c91c
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-14 b/tests/resources/merge-resolve.git/refs/heads/trivial-14
new file mode 100644
index 0000000..8905185
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-14
@@ -0,0 +1 @@
+7e2d058d5fedf8329db44db4fac610d6b1a89159
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-14-branch b/tests/resources/merge-resolve.git/refs/heads/trivial-14-branch
new file mode 100644
index 0000000..0158f95
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-14-branch
@@ -0,0 +1 @@
+8187117062b750eed4f93fd7e899f17b52ce554d
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-2alt b/tests/resources/merge-resolve.git/refs/heads/trivial-2alt
new file mode 100644
index 0000000..4740741
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-2alt
@@ -0,0 +1 @@
+566ab53c220a2eafc1212af1a024513230280ab9
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-2alt-branch b/tests/resources/merge-resolve.git/refs/heads/trivial-2alt-branch
new file mode 100644
index 0000000..2f5f1a4
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-2alt-branch
@@ -0,0 +1 @@
+c9174cef549ec94ecbc43ef03cdc775b4950becb
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-3alt b/tests/resources/merge-resolve.git/refs/heads/trivial-3alt
new file mode 100644
index 0000000..18e50ae
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-3alt
@@ -0,0 +1 @@
+4c9fac0707f8d4195037ae5a681aa48626491541
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-3alt-branch b/tests/resources/merge-resolve.git/refs/heads/trivial-3alt-branch
new file mode 100644
index 0000000..7bc1a8d
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-3alt-branch
@@ -0,0 +1 @@
+c607fc30883e335def28cd686b51f6cfa02b06ec
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-4 b/tests/resources/merge-resolve.git/refs/heads/trivial-4
new file mode 100644
index 0000000..f49bbf9
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-4
@@ -0,0 +1 @@
+cc3e3009134cb88014129fc8858d1101359e5e2f
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-4-branch b/tests/resources/merge-resolve.git/refs/heads/trivial-4-branch
new file mode 100644
index 0000000..bff519e
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-4-branch
@@ -0,0 +1 @@
+183310e30fb1499af8c619108ffea4d300b5e778
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-5alt-1 b/tests/resources/merge-resolve.git/refs/heads/trivial-5alt-1
new file mode 100644
index 0000000..963a7b3
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-5alt-1
@@ -0,0 +1 @@
+4fe93c0ec83eb6305cbace3dace88ecee1b63cb6
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-5alt-1-branch b/tests/resources/merge-resolve.git/refs/heads/trivial-5alt-1-branch
new file mode 100644
index 0000000..4a22138
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-5alt-1-branch
@@ -0,0 +1 @@
+478172cb2f5ff9b514bc9d04d3bd5ef5840cb3b2
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-5alt-2 b/tests/resources/merge-resolve.git/refs/heads/trivial-5alt-2
new file mode 100644
index 0000000..aa4ada1
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-5alt-2
@@ -0,0 +1 @@
+3b47b031b3e55ae11e14a05260b1c3ffd6838d55
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-5alt-2-branch b/tests/resources/merge-resolve.git/refs/heads/trivial-5alt-2-branch
new file mode 100644
index 0000000..5553cdb
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-5alt-2-branch
@@ -0,0 +1 @@
+f48097eb340dc5a7cae55aabcf1faf4548aa821f
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-6 b/tests/resources/merge-resolve.git/refs/heads/trivial-6
new file mode 100644
index 0000000..fb685bb
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-6
@@ -0,0 +1 @@
+99b4f7e4f24470fa06b980bc21f1095c2a9425c0
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-6-branch b/tests/resources/merge-resolve.git/refs/heads/trivial-6-branch
new file mode 100644
index 0000000..efc4c55
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-6-branch
@@ -0,0 +1 @@
+a43150a738849c59376cf30bb2a68348a83c8f48
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-7 b/tests/resources/merge-resolve.git/refs/heads/trivial-7
new file mode 100644
index 0000000..9c94243
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-7
@@ -0,0 +1 @@
+d874671ef5b20184836cb983bb273e5280384d0b
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-7-branch b/tests/resources/merge-resolve.git/refs/heads/trivial-7-branch
new file mode 100644
index 0000000..1762bb5
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-7-branch
@@ -0,0 +1 @@
+5195a1b480f66691b667f10a9e41e70115a78351
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-8 b/tests/resources/merge-resolve.git/refs/heads/trivial-8
new file mode 100644
index 0000000..837c491
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-8
@@ -0,0 +1 @@
+3575826c96a975031d2c14368529cc5c4353a8fd
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-8-branch b/tests/resources/merge-resolve.git/refs/heads/trivial-8-branch
new file mode 100644
index 0000000..874230e
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-8-branch
@@ -0,0 +1 @@
+52d8bc572af2b6d4ee0d5e62ed5d1fbad92210a9
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-9 b/tests/resources/merge-resolve.git/refs/heads/trivial-9
new file mode 100644
index 0000000..b968a3e
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-9
@@ -0,0 +1 @@
+c35dee9bcc0e989f3b0c40f68372a9a51b6c4e6a
diff --git a/tests/resources/merge-resolve.git/refs/heads/trivial-9-branch b/tests/resources/merge-resolve.git/refs/heads/trivial-9-branch
new file mode 100644
index 0000000..7f3097b
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/trivial-9-branch
@@ -0,0 +1 @@
+13d1be4ea52a6ced1d7a1d832f0ee3c399348e5e
diff --git a/tests/resources/merge-resolve.git/refs/heads/unrelated b/tests/resources/merge-resolve.git/refs/heads/unrelated
new file mode 100644
index 0000000..bb877be
--- /dev/null
+++ b/tests/resources/merge-resolve.git/refs/heads/unrelated
@@ -0,0 +1 @@
+55b4e4687e7a0d9ca367016ed930f385d4022e6f