# # # delete "tests/(minor)_context_diff" # # delete "tests/(minor)_context_diff/__driver__.lua" # # add_dir "tests/diff_output_formats" # # add_file "tests/diff_output_formats/A.cd" # content [46aef0f6bf02b1df8c38439637334c6808c1a736] # # add_file "tests/diff_output_formats/A.dst" # content [9a077b2b5aee84d84ae0f939c8059516485e6514] # # add_file "tests/diff_output_formats/A.src" # content [3461fa0f7108da24afeabbccf92a17c94bb7ef71] # # add_file "tests/diff_output_formats/A.ud" # content [8cb177661c243e9e45ef65bc892d5a7a4598c593] # # add_file "tests/diff_output_formats/B.cd" # content [13ec056b2d92dda60fdfed7e9f060190c68e1484] # # add_file "tests/diff_output_formats/B.dst" # content [8e23aad88bf337b76da6891368557a206f7b7f51] # # add_file "tests/diff_output_formats/B.src" # content [1219e5ab2b8d60bde359d2b8c569220400fae94e] # # add_file "tests/diff_output_formats/B.ud" # content [ad150a6c9927a70d921a361b3a9b8f89c0fbb349] # # add_file "tests/diff_output_formats/C.cd" # content [dfc8e8b1b564f42e96c52af0e5e73d09a9c31b6b] # # add_file "tests/diff_output_formats/C.dst" # content [d127b34595fcbd709ce2dedb033065e4e3b5d351] # # add_file "tests/diff_output_formats/C.src" # content [a855dab66165b2d529ede16de9e7334aaf58778f] # # add_file "tests/diff_output_formats/C.ud" # content [dd1ad0447e03f2d2217307f15b9161070291613a] # # add_file "tests/diff_output_formats/D.cd" # content [8efcc27199f95d4c4d47bda3aea64f7338a2d7d4] # # add_file "tests/diff_output_formats/D.dst" # content [500eab064ed1e352dd30a7f45535862b1d113826] # # add_file "tests/diff_output_formats/D.src" # content [f214a99c4a9fa271a7aa24d1b43e44263fcf6e6a] # # add_file "tests/diff_output_formats/D.ud" # content [5ea1449b845ca21262d6b8f2bc8f47f23bf791dd] # # add_file "tests/diff_output_formats/E.cd" # content [f5d8b8de0d8d73eeb4f69dbb49609449b9957235] # # add_file "tests/diff_output_formats/E.dst" # content [0452f954f62fe0e94ba5dd31d970cfbf3f1b0d69] # # add_file "tests/diff_output_formats/E.src" # content [b984e2f8d936bf914f04e727e43b10760b71dc4f] # # add_file "tests/diff_output_formats/E.ud" # content [ad0604646c055468ff6fa301ea11a7397dadb19e] # # add_file "tests/diff_output_formats/F.cd" # content [32fc67fdd05aeb4ab96674896723ac424141158b] # # add_file "tests/diff_output_formats/F.dst" # content [e6a9ea1b3439de3a9add6bb24d5d08862076dc67] # # add_file "tests/diff_output_formats/F.src" # content [4665d5dc5d5be1f5496840ca248f5d459be1fe0e] # # add_file "tests/diff_output_formats/F.ud" # content [2d1b447b46e7931557e1597c0f42cbdfce8fa388] # # add_file "tests/diff_output_formats/G.cd" # content [eea66c30a23938cc3332ad9c9d8b53149ae599eb] # # add_file "tests/diff_output_formats/G.dst" # content [609b4ae23447168db4bf7395433c41bdfcc249d0] # # add_file "tests/diff_output_formats/G.src" # content [b4acbe7b532ecffc6f1c7893d2531838807ffccd] # # add_file "tests/diff_output_formats/G.ud" # content [fd5b9eefe4e8e6fe5efe8945d383f7d1287c55e7] # # add_file "tests/diff_output_formats/H.cd" # content [e9e0b4f7c683e5620fd46d3d8fa9b68e77d4cd64] # # add_file "tests/diff_output_formats/H.dst" # content [2f076c5d449b7841f873a173f4c8ac162d778304] # # add_file "tests/diff_output_formats/H.src" # content [b0cf0d98709b3d0746269fbc0b6cbd5d2d6e6379] # # add_file "tests/diff_output_formats/H.ud" # content [5ef077f1da11fb8638d73e8a6571ff93a0fe1874] # # add_file "tests/diff_output_formats/I.cd" # content [45f80fe25d8530e0cba92232b431476e5b086b03] # # add_file "tests/diff_output_formats/I.dst" # content [ccdcc1ef902cf1c0082b992e731b057d30b40814] # # add_file "tests/diff_output_formats/I.src" # content [4d32e91882cbb8a15c643265088861861bef0c16] # # add_file "tests/diff_output_formats/I.ud" # content [39db6ed118af85891b95113e216a622a7d60eb63] # # add_file "tests/diff_output_formats/J.cd" # content [d81a80980c6eba5027990324da04f846fc3f9f3c] # # add_file "tests/diff_output_formats/J.dst" # content [93462d067100103422a0e59722155b3a916770a2] # # add_file "tests/diff_output_formats/J.src" # content [cc172a94441af071b19c3eddddc21053634e94bb] # # add_file "tests/diff_output_formats/J.ud" # content [dabba4fee19e7f11048c289796e4f836000c517b] # # add_file "tests/diff_output_formats/__driver__.lua" # content [17d8d713c190f1a91fdf10ce0702d7a0aacc5b09] # # add_file "tests/diff_output_formats/hello.cd" # content [eaa3e49d306b120a98b25ed7fd265948d5d9212c] # # add_file "tests/diff_output_formats/hello.dst" # content [94ebfe438b30bf18631c1846b2891b818f46aa23] # # add_file "tests/diff_output_formats/hello.src" # content [80ad86578e12a12c838cd4ff7ca226aa6bcc44e9] # # add_file "tests/diff_output_formats/hello.ud" # content [f94d586a2a50808c101ea613684f539c9a83b158] # # patch "cmd_files.cc" # from [808056118d77c0d6ac4350e7a2fb5cd54dce81d7] # to [70e0e2c4dc56071a62ca9cbc27b7e4d019ba8ce3] # # patch "diff_patch.cc" # from [76a1560eb3c74a1854280b871de9cf7aa67c56bc] # to [407da19b586420a2a7bd78689c1cac7848cf7ffc] # # patch "testsuite.lua" # from [d905626236ef9c395cb971c3e592cfe56c704015] # to [c37d2385d0fdb4cd7c26f3a57bce7afa4290a92f] # ============================================================ --- tests/diff_output_formats/A.cd 46aef0f6bf02b1df8c38439637334c6808c1a736 +++ tests/diff_output_formats/A.cd 46aef0f6bf02b1df8c38439637334c6808c1a736 @@ -0,0 +1,74 @@ +*** A 3461fa0f7108da24afeabbccf92a17c94bb7ef71 +--- A 9a077b2b5aee84d84ae0f939c8059516485e6514 +*************** +*** 1,19 **** +- hunk 0 -- initial 0 + hunk 0 -- initial 1 +- hunk 0 -- initial 2 +- hunk 0 -- initial 3 +- hunk 0 -- initial 4 +- hunk 0 -- initial 5 + hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +- hunk 1 -- initial 0 + hunk 1 -- initial 1 +- hunk 1 -- initial 2 +- hunk 1 -- initial 3 +- hunk 1 -- initial 4 +- hunk 1 -- initial 5 + hunk 1 -- initial 6 + hunk 1 -- initial 7 + hunk 1 -- initial 8 +--- 1,9 ---- +*************** +*** 78,85 **** +--- 68,80 ---- + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 ++ hunk 8 -- insert 3 ++ hunk 8 -- insert 1 + hunk 8 -- initial 0 + hunk 8 -- initial 1 ++ hunk 8 -- insert 4 ++ hunk 8 -- insert 2 ++ hunk 8 -- insert 0 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 +*************** +*** 88,100 **** + hunk 8 -- initial 7 + hunk 8 -- initial 8 + hunk 8 -- initial 9 +- hunk 9 -- initial 0 + hunk 9 -- initial 1 +- hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 + hunk 9 -- initial 5 +- hunk 9 -- initial 6 +- hunk 9 -- initial 7 +- hunk 9 -- initial 8 + hunk 9 -- initial 9 +--- 83,100 ---- + hunk 8 -- initial 7 + hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 1 + hunk 9 -- initial 3 + hunk 9 -- initial 4 + hunk 9 -- initial 5 + hunk 9 -- initial 9 ++ append 0 ++ append 1 ++ append 2 ++ append 3 ++ append 4 ++ append 5 ++ append 6 ++ append 7 ++ append 8 ++ append 9 ============================================================ --- tests/diff_output_formats/A.dst 9a077b2b5aee84d84ae0f939c8059516485e6514 +++ tests/diff_output_formats/A.dst 9a077b2b5aee84d84ae0f939c8059516485e6514 @@ -0,0 +1,100 @@ +hunk 0 -- initial 1 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 1 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- insert 3 +hunk 8 -- insert 1 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- insert 4 +hunk 8 -- insert 2 +hunk 8 -- insert 0 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 1 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 9 +append 0 +append 1 +append 2 +append 3 +append 4 +append 5 +append 6 +append 7 +append 8 +append 9 ============================================================ --- tests/diff_output_formats/A.src 3461fa0f7108da24afeabbccf92a17c94bb7ef71 +++ tests/diff_output_formats/A.src 3461fa0f7108da24afeabbccf92a17c94bb7ef71 @@ -0,0 +1,100 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 ============================================================ --- tests/diff_output_formats/A.ud 8cb177661c243e9e45ef65bc892d5a7a4598c593 +++ tests/diff_output_formats/A.ud 8cb177661c243e9e45ef65bc892d5a7a4598c593 @@ -0,0 +1,60 @@ +--- A 3461fa0f7108da24afeabbccf92a17c94bb7ef71 ++++ A 9a077b2b5aee84d84ae0f939c8059516485e6514 +@@ -1,19 +1,9 @@ +-hunk 0 -- initial 0 + hunk 0 -- initial 1 +-hunk 0 -- initial 2 +-hunk 0 -- initial 3 +-hunk 0 -- initial 4 +-hunk 0 -- initial 5 + hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +-hunk 1 -- initial 0 + hunk 1 -- initial 1 +-hunk 1 -- initial 2 +-hunk 1 -- initial 3 +-hunk 1 -- initial 4 +-hunk 1 -- initial 5 + hunk 1 -- initial 6 + hunk 1 -- initial 7 + hunk 1 -- initial 8 +@@ -78,8 +68,13 @@ + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 ++hunk 8 -- insert 3 ++hunk 8 -- insert 1 + hunk 8 -- initial 0 + hunk 8 -- initial 1 ++hunk 8 -- insert 4 ++hunk 8 -- insert 2 ++hunk 8 -- insert 0 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 +@@ -88,13 +83,18 @@ + hunk 8 -- initial 7 + hunk 8 -- initial 8 + hunk 8 -- initial 9 +-hunk 9 -- initial 0 + hunk 9 -- initial 1 +-hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 + hunk 9 -- initial 5 +-hunk 9 -- initial 6 +-hunk 9 -- initial 7 +-hunk 9 -- initial 8 + hunk 9 -- initial 9 ++append 0 ++append 1 ++append 2 ++append 3 ++append 4 ++append 5 ++append 6 ++append 7 ++append 8 ++append 9 ============================================================ --- tests/diff_output_formats/B.cd 13ec056b2d92dda60fdfed7e9f060190c68e1484 +++ tests/diff_output_formats/B.cd 13ec056b2d92dda60fdfed7e9f060190c68e1484 @@ -0,0 +1,168 @@ +*** B 1219e5ab2b8d60bde359d2b8c569220400fae94e +--- B 8e23aad88bf337b76da6891368557a206f7b7f51 +*************** +*** 1,50 **** + hunk 0 -- initial 0 + hunk 0 -- initial 1 + hunk 0 -- initial 2 + hunk 0 -- initial 3 + hunk 0 -- initial 4 + hunk 0 -- initial 5 + hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +- hunk 1 -- initial 0 +- hunk 1 -- initial 1 + hunk 1 -- initial 2 + hunk 1 -- initial 3 + hunk 1 -- initial 4 +- hunk 1 -- initial 5 +- hunk 1 -- initial 6 + hunk 1 -- initial 7 +- hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 +- hunk 3 -- initial 0 +- hunk 3 -- initial 1 + hunk 3 -- initial 2 +- hunk 3 -- initial 3 +- hunk 3 -- initial 4 + hunk 3 -- initial 5 +- hunk 3 -- initial 6 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 + hunk 4 -- initial 1 + hunk 4 -- initial 2 + hunk 4 -- initial 3 + hunk 4 -- initial 4 + hunk 4 -- initial 5 + hunk 4 -- initial 6 + hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 +--- 1,65 ---- ++ prepend 0 ++ prepend 1 ++ prepend 2 ++ prepend 3 ++ prepend 4 ++ prepend 5 ++ prepend 6 ++ prepend 7 ++ prepend 8 ++ prepend 9 + hunk 0 -- initial 0 ++ hunk 0 -- insert 1 + hunk 0 -- initial 1 + hunk 0 -- initial 2 + hunk 0 -- initial 3 + hunk 0 -- initial 4 + hunk 0 -- initial 5 ++ hunk 0 -- insert 4 + hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 ++ hunk 0 -- insert 0 ++ hunk 0 -- insert 2 ++ hunk 0 -- insert 3 + hunk 0 -- initial 9 + hunk 1 -- initial 2 + hunk 1 -- initial 3 + hunk 1 -- initial 4 + hunk 1 -- initial 7 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 + hunk 2 -- initial 2 ++ hunk 2 -- insert 3 + hunk 2 -- initial 3 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 + hunk 2 -- initial 7 ++ hunk 2 -- insert 2 ++ hunk 2 -- insert 0 + hunk 2 -- initial 8 ++ hunk 2 -- insert 4 ++ hunk 2 -- insert 1 + hunk 2 -- initial 9 + hunk 3 -- initial 2 + hunk 3 -- initial 5 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 ++ hunk 4 -- insert 1 + hunk 4 -- initial 1 ++ hunk 4 -- insert 3 + hunk 4 -- initial 2 ++ hunk 4 -- insert 0 + hunk 4 -- initial 3 + hunk 4 -- initial 4 + hunk 4 -- initial 5 + hunk 4 -- initial 6 ++ hunk 4 -- insert 2 ++ hunk 4 -- insert 4 + hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 +*************** +*** 78,92 **** + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 +- hunk 8 -- initial 0 + hunk 8 -- initial 1 + hunk 8 -- initial 2 +- hunk 8 -- initial 3 + hunk 8 -- initial 4 +- hunk 8 -- initial 5 +- hunk 8 -- initial 6 + hunk 8 -- initial 7 +- hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 +--- 93,102 ---- +*************** +*** 101,107 **** +--- 111,122 ---- + hunk 10 -- initial 0 + hunk 10 -- initial 1 + hunk 10 -- initial 2 ++ hunk 10 -- insert 0 ++ hunk 10 -- insert 1 ++ hunk 10 -- insert 3 + hunk 10 -- initial 3 ++ hunk 10 -- insert 2 ++ hunk 10 -- insert 4 + hunk 10 -- initial 4 + hunk 10 -- initial 5 + hunk 10 -- initial 6 +*************** +*** 109,120 **** + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 +- hunk 11 -- initial 1 + hunk 11 -- initial 2 + hunk 11 -- initial 3 +- hunk 11 -- initial 4 +- hunk 11 -- initial 5 +- hunk 11 -- initial 6 + hunk 11 -- initial 7 +- hunk 11 -- initial 8 + hunk 11 -- initial 9 +--- 124,130 ---- ============================================================ --- tests/diff_output_formats/B.dst 8e23aad88bf337b76da6891368557a206f7b7f51 +++ tests/diff_output_formats/B.dst 8e23aad88bf337b76da6891368557a206f7b7f51 @@ -0,0 +1,130 @@ +prepend 0 +prepend 1 +prepend 2 +prepend 3 +prepend 4 +prepend 5 +prepend 6 +prepend 7 +prepend 8 +prepend 9 +hunk 0 -- initial 0 +hunk 0 -- insert 1 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- insert 4 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- insert 0 +hunk 0 -- insert 2 +hunk 0 -- insert 3 +hunk 0 -- initial 9 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 7 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- insert 3 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- insert 2 +hunk 2 -- insert 0 +hunk 2 -- initial 8 +hunk 2 -- insert 4 +hunk 2 -- insert 1 +hunk 2 -- initial 9 +hunk 3 -- initial 2 +hunk 3 -- initial 5 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- insert 1 +hunk 4 -- initial 1 +hunk 4 -- insert 3 +hunk 4 -- initial 2 +hunk 4 -- insert 0 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- insert 2 +hunk 4 -- insert 4 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 4 +hunk 8 -- initial 7 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- insert 0 +hunk 10 -- insert 1 +hunk 10 -- insert 3 +hunk 10 -- initial 3 +hunk 10 -- insert 2 +hunk 10 -- insert 4 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 7 +hunk 11 -- initial 9 ============================================================ --- tests/diff_output_formats/B.src 1219e5ab2b8d60bde359d2b8c569220400fae94e +++ tests/diff_output_formats/B.src 1219e5ab2b8d60bde359d2b8c569220400fae94e @@ -0,0 +1,120 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 ============================================================ --- tests/diff_output_formats/B.ud ad150a6c9927a70d921a361b3a9b8f89c0fbb349 +++ tests/diff_output_formats/B.ud ad150a6c9927a70d921a361b3a9b8f89c0fbb349 @@ -0,0 +1,120 @@ +--- B 1219e5ab2b8d60bde359d2b8c569220400fae94e ++++ B 8e23aad88bf337b76da6891368557a206f7b7f51 +@@ -1,50 +1,65 @@ ++prepend 0 ++prepend 1 ++prepend 2 ++prepend 3 ++prepend 4 ++prepend 5 ++prepend 6 ++prepend 7 ++prepend 8 ++prepend 9 + hunk 0 -- initial 0 ++hunk 0 -- insert 1 + hunk 0 -- initial 1 + hunk 0 -- initial 2 + hunk 0 -- initial 3 + hunk 0 -- initial 4 + hunk 0 -- initial 5 ++hunk 0 -- insert 4 + hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 ++hunk 0 -- insert 0 ++hunk 0 -- insert 2 ++hunk 0 -- insert 3 + hunk 0 -- initial 9 +-hunk 1 -- initial 0 +-hunk 1 -- initial 1 + hunk 1 -- initial 2 + hunk 1 -- initial 3 + hunk 1 -- initial 4 +-hunk 1 -- initial 5 +-hunk 1 -- initial 6 + hunk 1 -- initial 7 +-hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 + hunk 2 -- initial 2 ++hunk 2 -- insert 3 + hunk 2 -- initial 3 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 + hunk 2 -- initial 7 ++hunk 2 -- insert 2 ++hunk 2 -- insert 0 + hunk 2 -- initial 8 ++hunk 2 -- insert 4 ++hunk 2 -- insert 1 + hunk 2 -- initial 9 +-hunk 3 -- initial 0 +-hunk 3 -- initial 1 + hunk 3 -- initial 2 +-hunk 3 -- initial 3 +-hunk 3 -- initial 4 + hunk 3 -- initial 5 +-hunk 3 -- initial 6 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 ++hunk 4 -- insert 1 + hunk 4 -- initial 1 ++hunk 4 -- insert 3 + hunk 4 -- initial 2 ++hunk 4 -- insert 0 + hunk 4 -- initial 3 + hunk 4 -- initial 4 + hunk 4 -- initial 5 + hunk 4 -- initial 6 ++hunk 4 -- insert 2 ++hunk 4 -- insert 4 + hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 +@@ -78,15 +93,10 @@ + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 +-hunk 8 -- initial 0 + hunk 8 -- initial 1 + hunk 8 -- initial 2 +-hunk 8 -- initial 3 + hunk 8 -- initial 4 +-hunk 8 -- initial 5 +-hunk 8 -- initial 6 + hunk 8 -- initial 7 +-hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 +@@ -101,7 +111,12 @@ + hunk 10 -- initial 0 + hunk 10 -- initial 1 + hunk 10 -- initial 2 ++hunk 10 -- insert 0 ++hunk 10 -- insert 1 ++hunk 10 -- insert 3 + hunk 10 -- initial 3 ++hunk 10 -- insert 2 ++hunk 10 -- insert 4 + hunk 10 -- initial 4 + hunk 10 -- initial 5 + hunk 10 -- initial 6 +@@ -109,12 +124,7 @@ + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 +-hunk 11 -- initial 1 + hunk 11 -- initial 2 + hunk 11 -- initial 3 +-hunk 11 -- initial 4 +-hunk 11 -- initial 5 +-hunk 11 -- initial 6 + hunk 11 -- initial 7 +-hunk 11 -- initial 8 + hunk 11 -- initial 9 ============================================================ --- tests/diff_output_formats/C.cd dfc8e8b1b564f42e96c52af0e5e73d09a9c31b6b +++ tests/diff_output_formats/C.cd dfc8e8b1b564f42e96c52af0e5e73d09a9c31b6b @@ -0,0 +1,143 @@ +*** C a855dab66165b2d529ede16de9e7334aaf58778f +--- C d127b34595fcbd709ce2dedb033065e4e3b5d351 +*************** +*** 14,22 **** +--- 14,27 ---- + hunk 1 -- initial 3 + hunk 1 -- initial 4 + hunk 1 -- initial 5 ++ hunk 1 -- insert 0 + hunk 1 -- initial 6 + hunk 1 -- initial 7 ++ hunk 1 -- insert 2 + hunk 1 -- initial 8 ++ hunk 1 -- insert 3 ++ hunk 1 -- insert 1 ++ hunk 1 -- insert 4 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 +*************** +*** 28,52 **** + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 + hunk 3 -- initial 1 + hunk 3 -- initial 2 + hunk 3 -- initial 3 + hunk 3 -- initial 4 + hunk 3 -- initial 5 + hunk 3 -- initial 6 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +- hunk 4 -- initial 0 +- hunk 4 -- initial 1 +- hunk 4 -- initial 2 + hunk 4 -- initial 3 +- hunk 4 -- initial 4 + hunk 4 -- initial 5 + hunk 4 -- initial 6 + hunk 4 -- initial 7 +- hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 + hunk 5 -- initial 1 +--- 33,57 ---- + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 ++ hunk 3 -- insert 0 + hunk 3 -- initial 0 + hunk 3 -- initial 1 ++ hunk 3 -- insert 3 + hunk 3 -- initial 2 ++ hunk 3 -- insert 2 + hunk 3 -- initial 3 + hunk 3 -- initial 4 + hunk 3 -- initial 5 ++ hunk 3 -- insert 1 ++ hunk 3 -- insert 4 + hunk 3 -- initial 6 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 3 + hunk 4 -- initial 5 + hunk 4 -- initial 6 + hunk 4 -- initial 7 + hunk 4 -- initial 9 + hunk 5 -- initial 0 + hunk 5 -- initial 1 +*************** +*** 78,91 **** +--- 83,101 ---- + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 ++ hunk 8 -- insert 1 + hunk 8 -- initial 0 ++ hunk 8 -- insert 2 + hunk 8 -- initial 1 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 ++ hunk 8 -- insert 0 + hunk 8 -- initial 5 ++ hunk 8 -- insert 3 + hunk 8 -- initial 6 + hunk 8 -- initial 7 ++ hunk 8 -- insert 4 + hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 +*************** +*** 118,140 **** + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 +- hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 +- hunk 12 -- initial 4 + hunk 12 -- initial 5 +- hunk 12 -- initial 6 +- hunk 12 -- initial 7 +- hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 + hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 + hunk 13 -- initial 4 + hunk 13 -- initial 5 + hunk 13 -- initial 6 + hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 +--- 128,150 ---- + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 5 + hunk 12 -- initial 9 ++ hunk 13 -- insert 2 + hunk 13 -- initial 0 ++ hunk 13 -- insert 1 + hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 + hunk 13 -- initial 4 + hunk 13 -- initial 5 ++ hunk 13 -- insert 0 + hunk 13 -- initial 6 + hunk 13 -- initial 7 + hunk 13 -- initial 8 ++ hunk 13 -- insert 3 ++ hunk 13 -- insert 4 + hunk 13 -- initial 9 ============================================================ --- tests/diff_output_formats/C.dst d127b34595fcbd709ce2dedb033065e4e3b5d351 +++ tests/diff_output_formats/C.dst d127b34595fcbd709ce2dedb033065e4e3b5d351 @@ -0,0 +1,150 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- insert 0 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- insert 2 +hunk 1 -- initial 8 +hunk 1 -- insert 3 +hunk 1 -- insert 1 +hunk 1 -- insert 4 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- insert 0 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- insert 3 +hunk 3 -- initial 2 +hunk 3 -- insert 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- insert 1 +hunk 3 -- insert 4 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 3 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- insert 1 +hunk 8 -- initial 0 +hunk 8 -- insert 2 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- insert 0 +hunk 8 -- initial 5 +hunk 8 -- insert 3 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- insert 4 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 5 +hunk 12 -- initial 9 +hunk 13 -- insert 2 +hunk 13 -- initial 0 +hunk 13 -- insert 1 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- insert 0 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- insert 3 +hunk 13 -- insert 4 +hunk 13 -- initial 9 ============================================================ --- tests/diff_output_formats/C.src a855dab66165b2d529ede16de9e7334aaf58778f +++ tests/diff_output_formats/C.src a855dab66165b2d529ede16de9e7334aaf58778f @@ -0,0 +1,140 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 ============================================================ --- tests/diff_output_formats/C.ud dd1ad0447e03f2d2217307f15b9161070291613a +++ tests/diff_output_formats/C.ud dd1ad0447e03f2d2217307f15b9161070291613a @@ -0,0 +1,97 @@ +--- C a855dab66165b2d529ede16de9e7334aaf58778f ++++ C d127b34595fcbd709ce2dedb033065e4e3b5d351 +@@ -14,9 +14,14 @@ + hunk 1 -- initial 3 + hunk 1 -- initial 4 + hunk 1 -- initial 5 ++hunk 1 -- insert 0 + hunk 1 -- initial 6 + hunk 1 -- initial 7 ++hunk 1 -- insert 2 + hunk 1 -- initial 8 ++hunk 1 -- insert 3 ++hunk 1 -- insert 1 ++hunk 1 -- insert 4 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 +@@ -28,25 +33,25 @@ + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 ++hunk 3 -- insert 0 + hunk 3 -- initial 0 + hunk 3 -- initial 1 ++hunk 3 -- insert 3 + hunk 3 -- initial 2 ++hunk 3 -- insert 2 + hunk 3 -- initial 3 + hunk 3 -- initial 4 + hunk 3 -- initial 5 ++hunk 3 -- insert 1 ++hunk 3 -- insert 4 + hunk 3 -- initial 6 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +-hunk 4 -- initial 0 +-hunk 4 -- initial 1 +-hunk 4 -- initial 2 + hunk 4 -- initial 3 +-hunk 4 -- initial 4 + hunk 4 -- initial 5 + hunk 4 -- initial 6 + hunk 4 -- initial 7 +-hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 + hunk 5 -- initial 1 +@@ -78,14 +83,19 @@ + hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 ++hunk 8 -- insert 1 + hunk 8 -- initial 0 ++hunk 8 -- insert 2 + hunk 8 -- initial 1 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 ++hunk 8 -- insert 0 + hunk 8 -- initial 5 ++hunk 8 -- insert 3 + hunk 8 -- initial 6 + hunk 8 -- initial 7 ++hunk 8 -- insert 4 + hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 +@@ -118,23 +128,23 @@ + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 +-hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 +-hunk 12 -- initial 4 + hunk 12 -- initial 5 +-hunk 12 -- initial 6 +-hunk 12 -- initial 7 +-hunk 12 -- initial 8 + hunk 12 -- initial 9 ++hunk 13 -- insert 2 + hunk 13 -- initial 0 ++hunk 13 -- insert 1 + hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 + hunk 13 -- initial 4 + hunk 13 -- initial 5 ++hunk 13 -- insert 0 + hunk 13 -- initial 6 + hunk 13 -- initial 7 + hunk 13 -- initial 8 ++hunk 13 -- insert 3 ++hunk 13 -- insert 4 + hunk 13 -- initial 9 ============================================================ --- tests/diff_output_formats/D.cd 8efcc27199f95d4c4d47bda3aea64f7338a2d7d4 +++ tests/diff_output_formats/D.cd 8efcc27199f95d4c4d47bda3aea64f7338a2d7d4 @@ -0,0 +1,142 @@ +*** D f214a99c4a9fa271a7aa24d1b43e44263fcf6e6a +--- D 500eab064ed1e352dd30a7f45535862b1d113826 +*************** +*** 1,12 **** +- hunk 0 -- initial 0 + hunk 0 -- initial 1 +- hunk 0 -- initial 2 + hunk 0 -- initial 3 + hunk 0 -- initial 4 +- hunk 0 -- initial 5 + hunk 0 -- initial 6 +- hunk 0 -- initial 7 +- hunk 0 -- initial 8 + hunk 0 -- initial 9 + hunk 1 -- initial 0 + hunk 1 -- initial 1 +--- 1,7 ---- +*************** +*** 38,51 **** + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +- hunk 4 -- initial 0 +- hunk 4 -- initial 1 + hunk 4 -- initial 2 +- hunk 4 -- initial 3 + hunk 4 -- initial 4 +- hunk 4 -- initial 5 + hunk 4 -- initial 6 +- hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 +--- 33,41 ---- +*************** +*** 68,82 **** + hunk 6 -- initial 7 + hunk 6 -- initial 8 + hunk 6 -- initial 9 +- hunk 7 -- initial 0 +- hunk 7 -- initial 1 +- hunk 7 -- initial 2 +- hunk 7 -- initial 3 + hunk 7 -- initial 4 + hunk 7 -- initial 5 + hunk 7 -- initial 6 + hunk 7 -- initial 7 +- hunk 7 -- initial 8 + hunk 7 -- initial 9 + hunk 8 -- initial 0 + hunk 8 -- initial 1 +--- 58,67 ---- +*************** +*** 99,131 **** + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 +- hunk 10 -- initial 1 + hunk 10 -- initial 2 +- hunk 10 -- initial 3 +- hunk 10 -- initial 4 +- hunk 10 -- initial 5 + hunk 10 -- initial 6 +- hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 + hunk 11 -- initial 1 + hunk 11 -- initial 2 + hunk 11 -- initial 3 + hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +--- 84,121 ---- + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 2 + hunk 10 -- initial 6 + hunk 10 -- initial 8 + hunk 10 -- initial 9 ++ hunk 11 -- insert 0 + hunk 11 -- initial 0 + hunk 11 -- initial 1 ++ hunk 11 -- insert 2 + hunk 11 -- initial 2 ++ hunk 11 -- insert 4 + hunk 11 -- initial 3 + hunk 11 -- initial 4 ++ hunk 11 -- insert 1 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 + hunk 11 -- initial 8 ++ hunk 11 -- insert 3 + hunk 11 -- initial 9 ++ hunk 12 -- insert 3 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 ++ hunk 12 -- insert 1 ++ hunk 12 -- insert 0 ++ hunk 12 -- insert 2 + hunk 12 -- initial 5 + hunk 12 -- initial 6 + hunk 12 -- initial 7 ++ hunk 12 -- insert 4 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +*************** +*** 148,160 **** + hunk 14 -- initial 7 + hunk 14 -- initial 8 + hunk 14 -- initial 9 +- hunk 15 -- initial 0 + hunk 15 -- initial 1 + hunk 15 -- initial 2 +- hunk 15 -- initial 3 + hunk 15 -- initial 4 + hunk 15 -- initial 5 +- hunk 15 -- initial 6 +- hunk 15 -- initial 7 +- hunk 15 -- initial 8 + hunk 15 -- initial 9 +--- 138,145 ---- ============================================================ --- tests/diff_output_formats/D.dst 500eab064ed1e352dd30a7f45535862b1d113826 +++ tests/diff_output_formats/D.dst 500eab064ed1e352dd30a7f45535862b1d113826 @@ -0,0 +1,145 @@ +hunk 0 -- initial 1 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 6 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 2 +hunk 4 -- initial 4 +hunk 4 -- initial 6 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 2 +hunk 10 -- initial 6 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- insert 0 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- insert 2 +hunk 11 -- initial 2 +hunk 11 -- insert 4 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- insert 1 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- insert 3 +hunk 11 -- initial 9 +hunk 12 -- insert 3 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- insert 1 +hunk 12 -- insert 0 +hunk 12 -- insert 2 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- insert 4 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 9 ============================================================ --- tests/diff_output_formats/D.src f214a99c4a9fa271a7aa24d1b43e44263fcf6e6a +++ tests/diff_output_formats/D.src f214a99c4a9fa271a7aa24d1b43e44263fcf6e6a @@ -0,0 +1,160 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 ============================================================ --- tests/diff_output_formats/D.ud 5ea1449b845ca21262d6b8f2bc8f47f23bf791dd +++ tests/diff_output_formats/D.ud 5ea1449b845ca21262d6b8f2bc8f47f23bf791dd @@ -0,0 +1,104 @@ +--- D f214a99c4a9fa271a7aa24d1b43e44263fcf6e6a ++++ D 500eab064ed1e352dd30a7f45535862b1d113826 +@@ -1,12 +1,7 @@ +-hunk 0 -- initial 0 + hunk 0 -- initial 1 +-hunk 0 -- initial 2 + hunk 0 -- initial 3 + hunk 0 -- initial 4 +-hunk 0 -- initial 5 + hunk 0 -- initial 6 +-hunk 0 -- initial 7 +-hunk 0 -- initial 8 + hunk 0 -- initial 9 + hunk 1 -- initial 0 + hunk 1 -- initial 1 +@@ -38,14 +33,9 @@ + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +-hunk 4 -- initial 0 +-hunk 4 -- initial 1 + hunk 4 -- initial 2 +-hunk 4 -- initial 3 + hunk 4 -- initial 4 +-hunk 4 -- initial 5 + hunk 4 -- initial 6 +-hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 +@@ -68,15 +58,10 @@ + hunk 6 -- initial 7 + hunk 6 -- initial 8 + hunk 6 -- initial 9 +-hunk 7 -- initial 0 +-hunk 7 -- initial 1 +-hunk 7 -- initial 2 +-hunk 7 -- initial 3 + hunk 7 -- initial 4 + hunk 7 -- initial 5 + hunk 7 -- initial 6 + hunk 7 -- initial 7 +-hunk 7 -- initial 8 + hunk 7 -- initial 9 + hunk 8 -- initial 0 + hunk 8 -- initial 1 +@@ -99,33 +84,38 @@ + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 +-hunk 10 -- initial 1 + hunk 10 -- initial 2 +-hunk 10 -- initial 3 +-hunk 10 -- initial 4 +-hunk 10 -- initial 5 + hunk 10 -- initial 6 +-hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 ++hunk 11 -- insert 0 + hunk 11 -- initial 0 + hunk 11 -- initial 1 ++hunk 11 -- insert 2 + hunk 11 -- initial 2 ++hunk 11 -- insert 4 + hunk 11 -- initial 3 + hunk 11 -- initial 4 ++hunk 11 -- insert 1 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 + hunk 11 -- initial 8 ++hunk 11 -- insert 3 + hunk 11 -- initial 9 ++hunk 12 -- insert 3 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 ++hunk 12 -- insert 1 ++hunk 12 -- insert 0 ++hunk 12 -- insert 2 + hunk 12 -- initial 5 + hunk 12 -- initial 6 + hunk 12 -- initial 7 ++hunk 12 -- insert 4 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +@@ -148,13 +138,8 @@ + hunk 14 -- initial 7 + hunk 14 -- initial 8 + hunk 14 -- initial 9 +-hunk 15 -- initial 0 + hunk 15 -- initial 1 + hunk 15 -- initial 2 +-hunk 15 -- initial 3 + hunk 15 -- initial 4 + hunk 15 -- initial 5 +-hunk 15 -- initial 6 +-hunk 15 -- initial 7 +-hunk 15 -- initial 8 + hunk 15 -- initial 9 ============================================================ --- tests/diff_output_formats/E.cd f5d8b8de0d8d73eeb4f69dbb49609449b9957235 +++ tests/diff_output_formats/E.cd f5d8b8de0d8d73eeb4f69dbb49609449b9957235 @@ -0,0 +1,128 @@ +*** E b984e2f8d936bf914f04e727e43b10760b71dc4f +--- E 0452f954f62fe0e94ba5dd31d970cfbf3f1b0d69 +*************** +*** 8,18 **** +--- 8,23 ---- + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 ++ hunk 1 -- insert 0 ++ hunk 1 -- insert 1 + hunk 1 -- initial 0 ++ hunk 1 -- insert 3 ++ hunk 1 -- insert 4 + hunk 1 -- initial 1 + hunk 1 -- initial 2 + hunk 1 -- initial 3 + hunk 1 -- initial 4 ++ hunk 1 -- insert 2 + hunk 1 -- initial 5 + hunk 1 -- initial 6 + hunk 1 -- initial 7 +*************** +*** 38,49 **** +--- 43,59 ---- + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 ++ hunk 4 -- insert 3 + hunk 4 -- initial 0 ++ hunk 4 -- insert 2 + hunk 4 -- initial 1 + hunk 4 -- initial 2 + hunk 4 -- initial 3 ++ hunk 4 -- insert 1 + hunk 4 -- initial 4 ++ hunk 4 -- insert 0 + hunk 4 -- initial 5 ++ hunk 4 -- insert 4 + hunk 4 -- initial 6 + hunk 4 -- initial 7 + hunk 4 -- initial 8 +*************** +*** 88,98 **** +--- 98,113 ---- + hunk 8 -- initial 7 + hunk 8 -- initial 8 + hunk 8 -- initial 9 ++ hunk 9 -- insert 2 + hunk 9 -- initial 0 ++ hunk 9 -- insert 4 + hunk 9 -- initial 1 ++ hunk 9 -- insert 3 ++ hunk 9 -- insert 1 + hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 ++ hunk 9 -- insert 0 + hunk 9 -- initial 5 + hunk 9 -- initial 6 + hunk 9 -- initial 7 +*************** +*** 104,112 **** +--- 119,132 ---- + hunk 10 -- initial 3 + hunk 10 -- initial 4 + hunk 10 -- initial 5 ++ hunk 10 -- insert 3 ++ hunk 10 -- insert 4 ++ hunk 10 -- insert 2 ++ hunk 10 -- insert 0 + hunk 10 -- initial 6 + hunk 10 -- initial 7 + hunk 10 -- initial 8 ++ hunk 10 -- insert 1 + hunk 10 -- initial 9 + hunk 11 -- initial 0 + hunk 11 -- initial 1 +*************** +*** 119,132 **** + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 0 +- hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 +- hunk 12 -- initial 4 +- hunk 12 -- initial 5 + hunk 12 -- initial 6 +- hunk 12 -- initial 7 +- hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 + hunk 13 -- initial 1 +--- 139,147 ---- +*************** +*** 138,152 **** + hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 +- hunk 14 -- initial 0 + hunk 14 -- initial 1 +- hunk 14 -- initial 2 +- hunk 14 -- initial 3 +- hunk 14 -- initial 4 + hunk 14 -- initial 5 + hunk 14 -- initial 6 + hunk 14 -- initial 7 +- hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 +--- 153,162 ---- +*************** +*** 178,180 **** +--- 188,200 ---- + hunk 17 -- initial 7 + hunk 17 -- initial 8 + hunk 17 -- initial 9 ++ append 0 ++ append 1 ++ append 2 ++ append 3 ++ append 4 ++ append 5 ++ append 6 ++ append 7 ++ append 8 ++ append 9 ============================================================ --- tests/diff_output_formats/E.dst 0452f954f62fe0e94ba5dd31d970cfbf3f1b0d69 +++ tests/diff_output_formats/E.dst 0452f954f62fe0e94ba5dd31d970cfbf3f1b0d69 @@ -0,0 +1,200 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- insert 0 +hunk 1 -- insert 1 +hunk 1 -- initial 0 +hunk 1 -- insert 3 +hunk 1 -- insert 4 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- insert 2 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- insert 3 +hunk 4 -- initial 0 +hunk 4 -- insert 2 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- insert 1 +hunk 4 -- initial 4 +hunk 4 -- insert 0 +hunk 4 -- initial 5 +hunk 4 -- insert 4 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- insert 2 +hunk 9 -- initial 0 +hunk 9 -- insert 4 +hunk 9 -- initial 1 +hunk 9 -- insert 3 +hunk 9 -- insert 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- insert 0 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- insert 3 +hunk 10 -- insert 4 +hunk 10 -- insert 2 +hunk 10 -- insert 0 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- insert 1 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 6 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 1 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +append 0 +append 1 +append 2 +append 3 +append 4 +append 5 +append 6 +append 7 +append 8 +append 9 ============================================================ --- tests/diff_output_formats/E.src b984e2f8d936bf914f04e727e43b10760b71dc4f +++ tests/diff_output_formats/E.src b984e2f8d936bf914f04e727e43b10760b71dc4f @@ -0,0 +1,180 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 ============================================================ --- tests/diff_output_formats/E.ud ad0604646c055468ff6fa301ea11a7397dadb19e +++ tests/diff_output_formats/E.ud ad0604646c055468ff6fa301ea11a7397dadb19e @@ -0,0 +1,114 @@ +--- E b984e2f8d936bf914f04e727e43b10760b71dc4f ++++ E 0452f954f62fe0e94ba5dd31d970cfbf3f1b0d69 +@@ -8,11 +8,16 @@ + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 ++hunk 1 -- insert 0 ++hunk 1 -- insert 1 + hunk 1 -- initial 0 ++hunk 1 -- insert 3 ++hunk 1 -- insert 4 + hunk 1 -- initial 1 + hunk 1 -- initial 2 + hunk 1 -- initial 3 + hunk 1 -- initial 4 ++hunk 1 -- insert 2 + hunk 1 -- initial 5 + hunk 1 -- initial 6 + hunk 1 -- initial 7 +@@ -38,12 +43,17 @@ + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 ++hunk 4 -- insert 3 + hunk 4 -- initial 0 ++hunk 4 -- insert 2 + hunk 4 -- initial 1 + hunk 4 -- initial 2 + hunk 4 -- initial 3 ++hunk 4 -- insert 1 + hunk 4 -- initial 4 ++hunk 4 -- insert 0 + hunk 4 -- initial 5 ++hunk 4 -- insert 4 + hunk 4 -- initial 6 + hunk 4 -- initial 7 + hunk 4 -- initial 8 +@@ -88,11 +98,16 @@ + hunk 8 -- initial 7 + hunk 8 -- initial 8 + hunk 8 -- initial 9 ++hunk 9 -- insert 2 + hunk 9 -- initial 0 ++hunk 9 -- insert 4 + hunk 9 -- initial 1 ++hunk 9 -- insert 3 ++hunk 9 -- insert 1 + hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 ++hunk 9 -- insert 0 + hunk 9 -- initial 5 + hunk 9 -- initial 6 + hunk 9 -- initial 7 +@@ -104,9 +119,14 @@ + hunk 10 -- initial 3 + hunk 10 -- initial 4 + hunk 10 -- initial 5 ++hunk 10 -- insert 3 ++hunk 10 -- insert 4 ++hunk 10 -- insert 2 ++hunk 10 -- insert 0 + hunk 10 -- initial 6 + hunk 10 -- initial 7 + hunk 10 -- initial 8 ++hunk 10 -- insert 1 + hunk 10 -- initial 9 + hunk 11 -- initial 0 + hunk 11 -- initial 1 +@@ -119,14 +139,9 @@ + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 0 +-hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 +-hunk 12 -- initial 4 +-hunk 12 -- initial 5 + hunk 12 -- initial 6 +-hunk 12 -- initial 7 +-hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 + hunk 13 -- initial 1 +@@ -138,15 +153,10 @@ + hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 +-hunk 14 -- initial 0 + hunk 14 -- initial 1 +-hunk 14 -- initial 2 +-hunk 14 -- initial 3 +-hunk 14 -- initial 4 + hunk 14 -- initial 5 + hunk 14 -- initial 6 + hunk 14 -- initial 7 +-hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 +@@ -178,3 +188,13 @@ + hunk 17 -- initial 7 + hunk 17 -- initial 8 + hunk 17 -- initial 9 ++append 0 ++append 1 ++append 2 ++append 3 ++append 4 ++append 5 ++append 6 ++append 7 ++append 8 ++append 9 ============================================================ --- tests/diff_output_formats/F.cd 32fc67fdd05aeb4ab96674896723ac424141158b +++ tests/diff_output_formats/F.cd 32fc67fdd05aeb4ab96674896723ac424141158b @@ -0,0 +1,182 @@ +*** F 4665d5dc5d5be1f5496840ca248f5d459be1fe0e +--- F e6a9ea1b3439de3a9add6bb24d5d08862076dc67 +*************** +*** 1,11 **** +--- 1,26 ---- ++ prepend 0 ++ prepend 1 ++ prepend 2 ++ prepend 3 ++ prepend 4 ++ prepend 5 ++ prepend 6 ++ prepend 7 ++ prepend 8 ++ prepend 9 ++ hunk 0 -- insert 2 + hunk 0 -- initial 0 + hunk 0 -- initial 1 + hunk 0 -- initial 2 + hunk 0 -- initial 3 ++ hunk 0 -- insert 1 ++ hunk 0 -- insert 0 + hunk 0 -- initial 4 + hunk 0 -- initial 5 + hunk 0 -- initial 6 ++ hunk 0 -- insert 4 + hunk 0 -- initial 7 ++ hunk 0 -- insert 3 + hunk 0 -- initial 8 + hunk 0 -- initial 9 + hunk 1 -- initial 0 +*************** +*** 22,42 **** + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 + hunk 3 -- initial 1 + hunk 3 -- initial 2 +- hunk 3 -- initial 3 +- hunk 3 -- initial 4 +- hunk 3 -- initial 5 + hunk 3 -- initial 6 +- hunk 3 -- initial 7 +- hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 + hunk 4 -- initial 1 +--- 37,57 ---- + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 ++ hunk 2 -- insert 2 ++ hunk 2 -- insert 4 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 ++ hunk 2 -- insert 1 ++ hunk 2 -- insert 0 ++ hunk 2 -- insert 3 + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 + hunk 3 -- initial 1 + hunk 3 -- initial 2 + hunk 3 -- initial 6 + hunk 3 -- initial 9 + hunk 4 -- initial 0 + hunk 4 -- initial 1 +*************** +*** 60,70 **** +--- 75,90 ---- + hunk 5 -- initial 9 + hunk 6 -- initial 0 + hunk 6 -- initial 1 ++ hunk 6 -- insert 1 + hunk 6 -- initial 2 + hunk 6 -- initial 3 + hunk 6 -- initial 4 + hunk 6 -- initial 5 + hunk 6 -- initial 6 ++ hunk 6 -- insert 0 ++ hunk 6 -- insert 2 ++ hunk 6 -- insert 3 ++ hunk 6 -- insert 4 + hunk 6 -- initial 7 + hunk 6 -- initial 8 + hunk 6 -- initial 9 +*************** +*** 98,111 **** + hunk 9 -- initial 7 + hunk 9 -- initial 8 + hunk 9 -- initial 9 +- hunk 10 -- initial 0 +- hunk 10 -- initial 1 +- hunk 10 -- initial 2 + hunk 10 -- initial 3 + hunk 10 -- initial 4 + hunk 10 -- initial 5 +- hunk 10 -- initial 6 +- hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 +--- 118,126 ---- +*************** +*** 115,142 **** + hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 +- hunk 12 -- initial 3 +- hunk 12 -- initial 4 + hunk 12 -- initial 5 +- hunk 12 -- initial 6 +- hunk 12 -- initial 7 +- hunk 12 -- initial 8 + hunk 12 -- initial 9 +- hunk 13 -- initial 0 +- hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 +- hunk 13 -- initial 4 +- hunk 13 -- initial 5 + hunk 13 -- initial 6 + hunk 13 -- initial 7 +- hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +--- 130,152 ---- + hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 ++ hunk 11 -- insert 2 ++ hunk 11 -- insert 4 + hunk 11 -- initial 7 + hunk 11 -- initial 8 ++ hunk 11 -- insert 0 ++ hunk 11 -- insert 3 ++ hunk 11 -- insert 1 + hunk 11 -- initial 9 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 5 + hunk 12 -- initial 9 + hunk 13 -- initial 2 + hunk 13 -- initial 3 + hunk 13 -- initial 6 + hunk 13 -- initial 7 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +*************** +*** 198,200 **** +--- 208,220 ---- + hunk 19 -- initial 7 + hunk 19 -- initial 8 + hunk 19 -- initial 9 ++ append 0 ++ append 1 ++ append 2 ++ append 3 ++ append 4 ++ append 5 ++ append 6 ++ append 7 ++ append 8 ++ append 9 ============================================================ --- tests/diff_output_formats/F.dst e6a9ea1b3439de3a9add6bb24d5d08862076dc67 +++ tests/diff_output_formats/F.dst e6a9ea1b3439de3a9add6bb24d5d08862076dc67 @@ -0,0 +1,220 @@ +prepend 0 +prepend 1 +prepend 2 +prepend 3 +prepend 4 +prepend 5 +prepend 6 +prepend 7 +prepend 8 +prepend 9 +hunk 0 -- insert 2 +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- insert 1 +hunk 0 -- insert 0 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- insert 4 +hunk 0 -- initial 7 +hunk 0 -- insert 3 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- insert 2 +hunk 2 -- insert 4 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- insert 1 +hunk 2 -- insert 0 +hunk 2 -- insert 3 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 6 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- insert 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- insert 0 +hunk 6 -- insert 2 +hunk 6 -- insert 3 +hunk 6 -- insert 4 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- insert 2 +hunk 11 -- insert 4 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- insert 0 +hunk 11 -- insert 3 +hunk 11 -- insert 1 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 5 +hunk 12 -- initial 9 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- initial 9 +append 0 +append 1 +append 2 +append 3 +append 4 +append 5 +append 6 +append 7 +append 8 +append 9 ============================================================ --- tests/diff_output_formats/F.src 4665d5dc5d5be1f5496840ca248f5d459be1fe0e +++ tests/diff_output_formats/F.src 4665d5dc5d5be1f5496840ca248f5d459be1fe0e @@ -0,0 +1,200 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- initial 9 ============================================================ --- tests/diff_output_formats/F.ud 2d1b447b46e7931557e1597c0f42cbdfce8fa388 +++ tests/diff_output_formats/F.ud 2d1b447b46e7931557e1597c0f42cbdfce8fa388 @@ -0,0 +1,136 @@ +--- F 4665d5dc5d5be1f5496840ca248f5d459be1fe0e ++++ F e6a9ea1b3439de3a9add6bb24d5d08862076dc67 +@@ -1,11 +1,26 @@ ++prepend 0 ++prepend 1 ++prepend 2 ++prepend 3 ++prepend 4 ++prepend 5 ++prepend 6 ++prepend 7 ++prepend 8 ++prepend 9 ++hunk 0 -- insert 2 + hunk 0 -- initial 0 + hunk 0 -- initial 1 + hunk 0 -- initial 2 + hunk 0 -- initial 3 ++hunk 0 -- insert 1 ++hunk 0 -- insert 0 + hunk 0 -- initial 4 + hunk 0 -- initial 5 + hunk 0 -- initial 6 ++hunk 0 -- insert 4 + hunk 0 -- initial 7 ++hunk 0 -- insert 3 + hunk 0 -- initial 8 + hunk 0 -- initial 9 + hunk 1 -- initial 0 +@@ -22,21 +37,21 @@ + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 ++hunk 2 -- insert 2 ++hunk 2 -- insert 4 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 ++hunk 2 -- insert 1 ++hunk 2 -- insert 0 ++hunk 2 -- insert 3 + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 + hunk 3 -- initial 1 + hunk 3 -- initial 2 +-hunk 3 -- initial 3 +-hunk 3 -- initial 4 +-hunk 3 -- initial 5 + hunk 3 -- initial 6 +-hunk 3 -- initial 7 +-hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 + hunk 4 -- initial 1 +@@ -60,11 +75,16 @@ + hunk 5 -- initial 9 + hunk 6 -- initial 0 + hunk 6 -- initial 1 ++hunk 6 -- insert 1 + hunk 6 -- initial 2 + hunk 6 -- initial 3 + hunk 6 -- initial 4 + hunk 6 -- initial 5 + hunk 6 -- initial 6 ++hunk 6 -- insert 0 ++hunk 6 -- insert 2 ++hunk 6 -- insert 3 ++hunk 6 -- insert 4 + hunk 6 -- initial 7 + hunk 6 -- initial 8 + hunk 6 -- initial 9 +@@ -98,14 +118,9 @@ + hunk 9 -- initial 7 + hunk 9 -- initial 8 + hunk 9 -- initial 9 +-hunk 10 -- initial 0 +-hunk 10 -- initial 1 +-hunk 10 -- initial 2 + hunk 10 -- initial 3 + hunk 10 -- initial 4 + hunk 10 -- initial 5 +-hunk 10 -- initial 6 +-hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 +@@ -115,28 +130,23 @@ + hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 ++hunk 11 -- insert 2 ++hunk 11 -- insert 4 + hunk 11 -- initial 7 + hunk 11 -- initial 8 ++hunk 11 -- insert 0 ++hunk 11 -- insert 3 ++hunk 11 -- insert 1 + hunk 11 -- initial 9 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 +-hunk 12 -- initial 3 +-hunk 12 -- initial 4 + hunk 12 -- initial 5 +-hunk 12 -- initial 6 +-hunk 12 -- initial 7 +-hunk 12 -- initial 8 + hunk 12 -- initial 9 +-hunk 13 -- initial 0 +-hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 +-hunk 13 -- initial 4 +-hunk 13 -- initial 5 + hunk 13 -- initial 6 + hunk 13 -- initial 7 +-hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +@@ -198,3 +208,13 @@ + hunk 19 -- initial 7 + hunk 19 -- initial 8 + hunk 19 -- initial 9 ++append 0 ++append 1 ++append 2 ++append 3 ++append 4 ++append 5 ++append 6 ++append 7 ++append 8 ++append 9 ============================================================ --- tests/diff_output_formats/G.cd eea66c30a23938cc3332ad9c9d8b53149ae599eb +++ tests/diff_output_formats/G.cd eea66c30a23938cc3332ad9c9d8b53149ae599eb @@ -0,0 +1,186 @@ +*** G b4acbe7b532ecffc6f1c7893d2531838807ffccd +--- G 609b4ae23447168db4bf7395433c41bdfcc249d0 +*************** +*** 8,20 **** + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +- hunk 1 -- initial 0 +- hunk 1 -- initial 1 +- hunk 1 -- initial 2 +- hunk 1 -- initial 3 + hunk 1 -- initial 4 + hunk 1 -- initial 5 +- hunk 1 -- initial 6 + hunk 1 -- initial 7 + hunk 1 -- initial 8 + hunk 1 -- initial 9 +--- 8,15 ---- +*************** +*** 29,40 **** +--- 24,40 ---- + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 ++ hunk 3 -- insert 0 ++ hunk 3 -- insert 3 + hunk 3 -- initial 1 ++ hunk 3 -- insert 4 + hunk 3 -- initial 2 + hunk 3 -- initial 3 + hunk 3 -- initial 4 ++ hunk 3 -- insert 2 + hunk 3 -- initial 5 + hunk 3 -- initial 6 ++ hunk 3 -- insert 1 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +*************** +*** 50,59 **** +--- 50,64 ---- + hunk 4 -- initial 9 + hunk 5 -- initial 0 + hunk 5 -- initial 1 ++ hunk 5 -- insert 1 ++ hunk 5 -- insert 0 + hunk 5 -- initial 2 + hunk 5 -- initial 3 ++ hunk 5 -- insert 4 + hunk 5 -- initial 4 + hunk 5 -- initial 5 ++ hunk 5 -- insert 2 ++ hunk 5 -- insert 3 + hunk 5 -- initial 6 + hunk 5 -- initial 7 + hunk 5 -- initial 8 +*************** +*** 109,118 **** +--- 114,128 ---- + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 ++ hunk 11 -- insert 4 + hunk 11 -- initial 1 ++ hunk 11 -- insert 3 ++ hunk 11 -- insert 2 + hunk 11 -- initial 2 + hunk 11 -- initial 3 + hunk 11 -- initial 4 ++ hunk 11 -- insert 1 ++ hunk 11 -- insert 0 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 +*************** +*** 122,142 **** + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +- hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 +- hunk 13 -- initial 4 +- hunk 13 -- initial 5 +- hunk 13 -- initial 6 + hunk 13 -- initial 7 +- hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +--- 132,152 ---- + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 ++ hunk 12 -- insert 2 ++ hunk 12 -- insert 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 ++ hunk 12 -- insert 4 ++ hunk 12 -- insert 0 ++ hunk 12 -- insert 1 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 + hunk 13 -- initial 2 + hunk 13 -- initial 3 + hunk 13 -- initial 7 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +*************** +*** 149,171 **** + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 + hunk 15 -- initial 2 + hunk 15 -- initial 3 + hunk 15 -- initial 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 + hunk 15 -- initial 7 + hunk 15 -- initial 8 + hunk 15 -- initial 9 +- hunk 16 -- initial 0 + hunk 16 -- initial 1 +- hunk 16 -- initial 2 + hunk 16 -- initial 3 + hunk 16 -- initial 4 +- hunk 16 -- initial 5 +- hunk 16 -- initial 6 +- hunk 16 -- initial 7 + hunk 16 -- initial 8 + hunk 16 -- initial 9 + hunk 17 -- initial 0 +--- 159,181 ---- + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 ++ hunk 15 -- insert 2 ++ hunk 15 -- insert 1 + hunk 15 -- initial 1 ++ hunk 15 -- insert 3 + hunk 15 -- initial 2 ++ hunk 15 -- insert 0 + hunk 15 -- initial 3 + hunk 15 -- initial 4 ++ hunk 15 -- insert 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 + hunk 15 -- initial 7 + hunk 15 -- initial 8 + hunk 15 -- initial 9 + hunk 16 -- initial 1 + hunk 16 -- initial 3 + hunk 16 -- initial 4 + hunk 16 -- initial 8 + hunk 16 -- initial 9 + hunk 17 -- initial 0 +*************** +*** 211,220 **** +--- 221,235 ---- + hunk 21 -- initial 0 + hunk 21 -- initial 1 + hunk 21 -- initial 2 ++ hunk 21 -- insert 1 + hunk 21 -- initial 3 + hunk 21 -- initial 4 + hunk 21 -- initial 5 + hunk 21 -- initial 6 ++ hunk 21 -- insert 4 + hunk 21 -- initial 7 ++ hunk 21 -- insert 3 + hunk 21 -- initial 8 ++ hunk 21 -- insert 0 ++ hunk 21 -- insert 2 + hunk 21 -- initial 9 ============================================================ --- tests/diff_output_formats/G.dst 609b4ae23447168db4bf7395433c41bdfcc249d0 +++ tests/diff_output_formats/G.dst 609b4ae23447168db4bf7395433c41bdfcc249d0 @@ -0,0 +1,235 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- insert 0 +hunk 3 -- insert 3 +hunk 3 -- initial 1 +hunk 3 -- insert 4 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- insert 2 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- insert 1 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- insert 1 +hunk 5 -- insert 0 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- insert 4 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- insert 2 +hunk 5 -- insert 3 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- insert 4 +hunk 11 -- initial 1 +hunk 11 -- insert 3 +hunk 11 -- insert 2 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- insert 1 +hunk 11 -- insert 0 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- insert 2 +hunk 12 -- insert 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- insert 4 +hunk 12 -- insert 0 +hunk 12 -- insert 1 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 7 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- insert 2 +hunk 15 -- insert 1 +hunk 15 -- initial 1 +hunk 15 -- insert 3 +hunk 15 -- initial 2 +hunk 15 -- insert 0 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- insert 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 1 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- initial 9 +hunk 20 -- initial 0 +hunk 20 -- initial 1 +hunk 20 -- initial 2 +hunk 20 -- initial 3 +hunk 20 -- initial 4 +hunk 20 -- initial 5 +hunk 20 -- initial 6 +hunk 20 -- initial 7 +hunk 20 -- initial 8 +hunk 20 -- initial 9 +hunk 21 -- initial 0 +hunk 21 -- initial 1 +hunk 21 -- initial 2 +hunk 21 -- insert 1 +hunk 21 -- initial 3 +hunk 21 -- initial 4 +hunk 21 -- initial 5 +hunk 21 -- initial 6 +hunk 21 -- insert 4 +hunk 21 -- initial 7 +hunk 21 -- insert 3 +hunk 21 -- initial 8 +hunk 21 -- insert 0 +hunk 21 -- insert 2 +hunk 21 -- initial 9 ============================================================ --- tests/diff_output_formats/G.src b4acbe7b532ecffc6f1c7893d2531838807ffccd +++ tests/diff_output_formats/G.src b4acbe7b532ecffc6f1c7893d2531838807ffccd @@ -0,0 +1,220 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- initial 9 +hunk 20 -- initial 0 +hunk 20 -- initial 1 +hunk 20 -- initial 2 +hunk 20 -- initial 3 +hunk 20 -- initial 4 +hunk 20 -- initial 5 +hunk 20 -- initial 6 +hunk 20 -- initial 7 +hunk 20 -- initial 8 +hunk 20 -- initial 9 +hunk 21 -- initial 0 +hunk 21 -- initial 1 +hunk 21 -- initial 2 +hunk 21 -- initial 3 +hunk 21 -- initial 4 +hunk 21 -- initial 5 +hunk 21 -- initial 6 +hunk 21 -- initial 7 +hunk 21 -- initial 8 +hunk 21 -- initial 9 ============================================================ --- tests/diff_output_formats/G.ud fd5b9eefe4e8e6fe5efe8945d383f7d1287c55e7 +++ tests/diff_output_formats/G.ud fd5b9eefe4e8e6fe5efe8945d383f7d1287c55e7 @@ -0,0 +1,138 @@ +--- G b4acbe7b532ecffc6f1c7893d2531838807ffccd ++++ G 609b4ae23447168db4bf7395433c41bdfcc249d0 +@@ -8,13 +8,8 @@ + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +-hunk 1 -- initial 0 +-hunk 1 -- initial 1 +-hunk 1 -- initial 2 +-hunk 1 -- initial 3 + hunk 1 -- initial 4 + hunk 1 -- initial 5 +-hunk 1 -- initial 6 + hunk 1 -- initial 7 + hunk 1 -- initial 8 + hunk 1 -- initial 9 +@@ -29,12 +24,17 @@ + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 ++hunk 3 -- insert 0 ++hunk 3 -- insert 3 + hunk 3 -- initial 1 ++hunk 3 -- insert 4 + hunk 3 -- initial 2 + hunk 3 -- initial 3 + hunk 3 -- initial 4 ++hunk 3 -- insert 2 + hunk 3 -- initial 5 + hunk 3 -- initial 6 ++hunk 3 -- insert 1 + hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 +@@ -50,10 +50,15 @@ + hunk 4 -- initial 9 + hunk 5 -- initial 0 + hunk 5 -- initial 1 ++hunk 5 -- insert 1 ++hunk 5 -- insert 0 + hunk 5 -- initial 2 + hunk 5 -- initial 3 ++hunk 5 -- insert 4 + hunk 5 -- initial 4 + hunk 5 -- initial 5 ++hunk 5 -- insert 2 ++hunk 5 -- insert 3 + hunk 5 -- initial 6 + hunk 5 -- initial 7 + hunk 5 -- initial 8 +@@ -109,10 +114,15 @@ + hunk 10 -- initial 8 + hunk 10 -- initial 9 + hunk 11 -- initial 0 ++hunk 11 -- insert 4 + hunk 11 -- initial 1 ++hunk 11 -- insert 3 ++hunk 11 -- insert 2 + hunk 11 -- initial 2 + hunk 11 -- initial 3 + hunk 11 -- initial 4 ++hunk 11 -- insert 1 ++hunk 11 -- insert 0 + hunk 11 -- initial 5 + hunk 11 -- initial 6 + hunk 11 -- initial 7 +@@ -122,21 +132,21 @@ + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 ++hunk 12 -- insert 2 ++hunk 12 -- insert 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 ++hunk 12 -- insert 4 ++hunk 12 -- insert 0 ++hunk 12 -- insert 1 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +-hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 3 +-hunk 13 -- initial 4 +-hunk 13 -- initial 5 +-hunk 13 -- initial 6 + hunk 13 -- initial 7 +-hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 +@@ -149,23 +159,23 @@ + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 ++hunk 15 -- insert 2 ++hunk 15 -- insert 1 + hunk 15 -- initial 1 ++hunk 15 -- insert 3 + hunk 15 -- initial 2 ++hunk 15 -- insert 0 + hunk 15 -- initial 3 + hunk 15 -- initial 4 ++hunk 15 -- insert 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 + hunk 15 -- initial 7 + hunk 15 -- initial 8 + hunk 15 -- initial 9 +-hunk 16 -- initial 0 + hunk 16 -- initial 1 +-hunk 16 -- initial 2 + hunk 16 -- initial 3 + hunk 16 -- initial 4 +-hunk 16 -- initial 5 +-hunk 16 -- initial 6 +-hunk 16 -- initial 7 + hunk 16 -- initial 8 + hunk 16 -- initial 9 + hunk 17 -- initial 0 +@@ -211,10 +221,15 @@ + hunk 21 -- initial 0 + hunk 21 -- initial 1 + hunk 21 -- initial 2 ++hunk 21 -- insert 1 + hunk 21 -- initial 3 + hunk 21 -- initial 4 + hunk 21 -- initial 5 + hunk 21 -- initial 6 ++hunk 21 -- insert 4 + hunk 21 -- initial 7 ++hunk 21 -- insert 3 + hunk 21 -- initial 8 ++hunk 21 -- insert 0 ++hunk 21 -- insert 2 + hunk 21 -- initial 9 ============================================================ --- tests/diff_output_formats/H.cd e9e0b4f7c683e5620fd46d3d8fa9b68e77d4cd64 +++ tests/diff_output_formats/H.cd e9e0b4f7c683e5620fd46d3d8fa9b68e77d4cd64 @@ -0,0 +1,222 @@ +*** H b0cf0d98709b3d0746269fbc0b6cbd5d2d6e6379 +--- H 2f076c5d449b7841f873a173f4c8ac162d778304 +*************** +*** 42,51 **** +--- 42,56 ---- + hunk 4 -- initial 1 + hunk 4 -- initial 2 + hunk 4 -- initial 3 ++ hunk 4 -- insert 4 ++ hunk 4 -- insert 0 + hunk 4 -- initial 4 + hunk 4 -- initial 5 ++ hunk 4 -- insert 3 ++ hunk 4 -- insert 2 + hunk 4 -- initial 6 + hunk 4 -- initial 7 ++ hunk 4 -- insert 1 + hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 +*************** +*** 59,92 **** + hunk 5 -- initial 8 + hunk 5 -- initial 9 + hunk 6 -- initial 0 + hunk 6 -- initial 1 + hunk 6 -- initial 2 + hunk 6 -- initial 3 + hunk 6 -- initial 4 + hunk 6 -- initial 5 + hunk 6 -- initial 6 + hunk 6 -- initial 7 + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 1 + hunk 7 -- initial 2 + hunk 7 -- initial 3 +- hunk 7 -- initial 4 +- hunk 7 -- initial 5 +- hunk 7 -- initial 6 +- hunk 7 -- initial 7 +- hunk 7 -- initial 8 + hunk 7 -- initial 9 + hunk 8 -- initial 0 + hunk 8 -- initial 1 +- hunk 8 -- initial 2 +- hunk 8 -- initial 3 +- hunk 8 -- initial 4 + hunk 8 -- initial 5 + hunk 8 -- initial 6 +- hunk 8 -- initial 7 +- hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 +--- 64,92 ---- + hunk 5 -- initial 8 + hunk 5 -- initial 9 + hunk 6 -- initial 0 ++ hunk 6 -- insert 1 ++ hunk 6 -- insert 0 + hunk 6 -- initial 1 + hunk 6 -- initial 2 ++ hunk 6 -- insert 4 + hunk 6 -- initial 3 ++ hunk 6 -- insert 2 + hunk 6 -- initial 4 + hunk 6 -- initial 5 + hunk 6 -- initial 6 + hunk 6 -- initial 7 ++ hunk 6 -- insert 3 + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 1 + hunk 7 -- initial 2 + hunk 7 -- initial 3 + hunk 7 -- initial 9 + hunk 8 -- initial 0 + hunk 8 -- initial 1 + hunk 8 -- initial 5 + hunk 8 -- initial 6 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 +*************** +*** 95,102 **** +--- 95,107 ---- + hunk 9 -- initial 4 + hunk 9 -- initial 5 + hunk 9 -- initial 6 ++ hunk 9 -- insert 0 + hunk 9 -- initial 7 ++ hunk 9 -- insert 1 + hunk 9 -- initial 8 ++ hunk 9 -- insert 3 ++ hunk 9 -- insert 4 ++ hunk 9 -- insert 2 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 +*************** +*** 118,161 **** + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 + hunk 12 -- initial 0 + hunk 12 -- initial 1 + hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 +- hunk 13 -- initial 0 + hunk 13 -- initial 1 + hunk 13 -- initial 2 +- hunk 13 -- initial 3 +- hunk 13 -- initial 4 +- hunk 13 -- initial 5 + hunk 13 -- initial 6 +- hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 + hunk 14 -- initial 2 + hunk 14 -- initial 3 + hunk 14 -- initial 4 + hunk 14 -- initial 5 + hunk 14 -- initial 6 + hunk 14 -- initial 7 + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 + hunk 15 -- initial 2 + hunk 15 -- initial 3 + hunk 15 -- initial 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 + hunk 15 -- initial 7 + hunk 15 -- initial 8 + hunk 15 -- initial 9 + hunk 16 -- initial 0 +--- 123,176 ---- + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 ++ hunk 12 -- insert 4 + hunk 12 -- initial 0 + hunk 12 -- initial 1 ++ hunk 12 -- insert 3 + hunk 12 -- initial 2 + hunk 12 -- initial 3 ++ hunk 12 -- insert 2 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 ++ hunk 12 -- insert 1 ++ hunk 12 -- insert 0 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 1 + hunk 13 -- initial 2 + hunk 13 -- initial 6 + hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 ++ hunk 14 -- insert 1 + hunk 14 -- initial 2 + hunk 14 -- initial 3 + hunk 14 -- initial 4 ++ hunk 14 -- insert 3 + hunk 14 -- initial 5 + hunk 14 -- initial 6 + hunk 14 -- initial 7 ++ hunk 14 -- insert 0 + hunk 14 -- initial 8 ++ hunk 14 -- insert 4 ++ hunk 14 -- insert 2 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 ++ hunk 15 -- insert 1 + hunk 15 -- initial 2 + hunk 15 -- initial 3 ++ hunk 15 -- insert 2 ++ hunk 15 -- insert 0 + hunk 15 -- initial 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 ++ hunk 15 -- insert 3 + hunk 15 -- initial 7 ++ hunk 15 -- insert 4 + hunk 15 -- initial 8 + hunk 15 -- initial 9 + hunk 16 -- initial 0 +*************** +*** 192,202 **** +--- 207,222 ---- + hunk 19 -- initial 1 + hunk 19 -- initial 2 + hunk 19 -- initial 3 ++ hunk 19 -- insert 3 ++ hunk 19 -- insert 0 + hunk 19 -- initial 4 + hunk 19 -- initial 5 + hunk 19 -- initial 6 + hunk 19 -- initial 7 + hunk 19 -- initial 8 ++ hunk 19 -- insert 1 ++ hunk 19 -- insert 2 ++ hunk 19 -- insert 4 + hunk 19 -- initial 9 + hunk 20 -- initial 0 + hunk 20 -- initial 1 ============================================================ --- tests/diff_output_formats/H.dst 2f076c5d449b7841f873a173f4c8ac162d778304 +++ tests/diff_output_formats/H.dst 2f076c5d449b7841f873a173f4c8ac162d778304 @@ -0,0 +1,260 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- insert 4 +hunk 4 -- insert 0 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- insert 3 +hunk 4 -- insert 2 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- insert 1 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- insert 1 +hunk 6 -- insert 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- insert 4 +hunk 6 -- initial 3 +hunk 6 -- insert 2 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- insert 3 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- insert 0 +hunk 9 -- initial 7 +hunk 9 -- insert 1 +hunk 9 -- initial 8 +hunk 9 -- insert 3 +hunk 9 -- insert 4 +hunk 9 -- insert 2 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- insert 4 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- insert 3 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- insert 2 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- insert 1 +hunk 12 -- insert 0 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 6 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- insert 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- insert 3 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- insert 0 +hunk 14 -- initial 8 +hunk 14 -- insert 4 +hunk 14 -- insert 2 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- insert 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- insert 2 +hunk 15 -- insert 0 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- insert 3 +hunk 15 -- initial 7 +hunk 15 -- insert 4 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- insert 3 +hunk 19 -- insert 0 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- insert 1 +hunk 19 -- insert 2 +hunk 19 -- insert 4 +hunk 19 -- initial 9 +hunk 20 -- initial 0 +hunk 20 -- initial 1 +hunk 20 -- initial 2 +hunk 20 -- initial 3 +hunk 20 -- initial 4 +hunk 20 -- initial 5 +hunk 20 -- initial 6 +hunk 20 -- initial 7 +hunk 20 -- initial 8 +hunk 20 -- initial 9 +hunk 21 -- initial 0 +hunk 21 -- initial 1 +hunk 21 -- initial 2 +hunk 21 -- initial 3 +hunk 21 -- initial 4 +hunk 21 -- initial 5 +hunk 21 -- initial 6 +hunk 21 -- initial 7 +hunk 21 -- initial 8 +hunk 21 -- initial 9 +hunk 22 -- initial 0 +hunk 22 -- initial 1 +hunk 22 -- initial 2 +hunk 22 -- initial 3 +hunk 22 -- initial 4 +hunk 22 -- initial 5 +hunk 22 -- initial 6 +hunk 22 -- initial 7 +hunk 22 -- initial 8 +hunk 22 -- initial 9 +hunk 23 -- initial 0 +hunk 23 -- initial 1 +hunk 23 -- initial 2 +hunk 23 -- initial 3 +hunk 23 -- initial 4 +hunk 23 -- initial 5 +hunk 23 -- initial 6 +hunk 23 -- initial 7 +hunk 23 -- initial 8 +hunk 23 -- initial 9 ============================================================ --- tests/diff_output_formats/H.src b0cf0d98709b3d0746269fbc0b6cbd5d2d6e6379 +++ tests/diff_output_formats/H.src b0cf0d98709b3d0746269fbc0b6cbd5d2d6e6379 @@ -0,0 +1,240 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- initial 9 +hunk 20 -- initial 0 +hunk 20 -- initial 1 +hunk 20 -- initial 2 +hunk 20 -- initial 3 +hunk 20 -- initial 4 +hunk 20 -- initial 5 +hunk 20 -- initial 6 +hunk 20 -- initial 7 +hunk 20 -- initial 8 +hunk 20 -- initial 9 +hunk 21 -- initial 0 +hunk 21 -- initial 1 +hunk 21 -- initial 2 +hunk 21 -- initial 3 +hunk 21 -- initial 4 +hunk 21 -- initial 5 +hunk 21 -- initial 6 +hunk 21 -- initial 7 +hunk 21 -- initial 8 +hunk 21 -- initial 9 +hunk 22 -- initial 0 +hunk 22 -- initial 1 +hunk 22 -- initial 2 +hunk 22 -- initial 3 +hunk 22 -- initial 4 +hunk 22 -- initial 5 +hunk 22 -- initial 6 +hunk 22 -- initial 7 +hunk 22 -- initial 8 +hunk 22 -- initial 9 +hunk 23 -- initial 0 +hunk 23 -- initial 1 +hunk 23 -- initial 2 +hunk 23 -- initial 3 +hunk 23 -- initial 4 +hunk 23 -- initial 5 +hunk 23 -- initial 6 +hunk 23 -- initial 7 +hunk 23 -- initial 8 +hunk 23 -- initial 9 ============================================================ --- tests/diff_output_formats/H.ud 5ef077f1da11fb8638d73e8a6571ff93a0fe1874 +++ tests/diff_output_formats/H.ud 5ef077f1da11fb8638d73e8a6571ff93a0fe1874 @@ -0,0 +1,149 @@ +--- H b0cf0d98709b3d0746269fbc0b6cbd5d2d6e6379 ++++ H 2f076c5d449b7841f873a173f4c8ac162d778304 +@@ -42,10 +42,15 @@ + hunk 4 -- initial 1 + hunk 4 -- initial 2 + hunk 4 -- initial 3 ++hunk 4 -- insert 4 ++hunk 4 -- insert 0 + hunk 4 -- initial 4 + hunk 4 -- initial 5 ++hunk 4 -- insert 3 ++hunk 4 -- insert 2 + hunk 4 -- initial 6 + hunk 4 -- initial 7 ++hunk 4 -- insert 1 + hunk 4 -- initial 8 + hunk 4 -- initial 9 + hunk 5 -- initial 0 +@@ -59,34 +64,29 @@ + hunk 5 -- initial 8 + hunk 5 -- initial 9 + hunk 6 -- initial 0 ++hunk 6 -- insert 1 ++hunk 6 -- insert 0 + hunk 6 -- initial 1 + hunk 6 -- initial 2 ++hunk 6 -- insert 4 + hunk 6 -- initial 3 ++hunk 6 -- insert 2 + hunk 6 -- initial 4 + hunk 6 -- initial 5 + hunk 6 -- initial 6 + hunk 6 -- initial 7 ++hunk 6 -- insert 3 + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 1 + hunk 7 -- initial 2 + hunk 7 -- initial 3 +-hunk 7 -- initial 4 +-hunk 7 -- initial 5 +-hunk 7 -- initial 6 +-hunk 7 -- initial 7 +-hunk 7 -- initial 8 + hunk 7 -- initial 9 + hunk 8 -- initial 0 + hunk 8 -- initial 1 +-hunk 8 -- initial 2 +-hunk 8 -- initial 3 +-hunk 8 -- initial 4 + hunk 8 -- initial 5 + hunk 8 -- initial 6 +-hunk 8 -- initial 7 +-hunk 8 -- initial 8 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 +@@ -95,8 +95,13 @@ + hunk 9 -- initial 4 + hunk 9 -- initial 5 + hunk 9 -- initial 6 ++hunk 9 -- insert 0 + hunk 9 -- initial 7 ++hunk 9 -- insert 1 + hunk 9 -- initial 8 ++hunk 9 -- insert 3 ++hunk 9 -- insert 4 ++hunk 9 -- insert 2 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 +@@ -118,44 +123,54 @@ + hunk 11 -- initial 7 + hunk 11 -- initial 8 + hunk 11 -- initial 9 ++hunk 12 -- insert 4 + hunk 12 -- initial 0 + hunk 12 -- initial 1 ++hunk 12 -- insert 3 + hunk 12 -- initial 2 + hunk 12 -- initial 3 ++hunk 12 -- insert 2 + hunk 12 -- initial 4 + hunk 12 -- initial 5 + hunk 12 -- initial 6 ++hunk 12 -- insert 1 ++hunk 12 -- insert 0 + hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 +-hunk 13 -- initial 0 + hunk 13 -- initial 1 + hunk 13 -- initial 2 +-hunk 13 -- initial 3 +-hunk 13 -- initial 4 +-hunk 13 -- initial 5 + hunk 13 -- initial 6 +-hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 + hunk 14 -- initial 1 ++hunk 14 -- insert 1 + hunk 14 -- initial 2 + hunk 14 -- initial 3 + hunk 14 -- initial 4 ++hunk 14 -- insert 3 + hunk 14 -- initial 5 + hunk 14 -- initial 6 + hunk 14 -- initial 7 ++hunk 14 -- insert 0 + hunk 14 -- initial 8 ++hunk 14 -- insert 4 ++hunk 14 -- insert 2 + hunk 14 -- initial 9 + hunk 15 -- initial 0 + hunk 15 -- initial 1 ++hunk 15 -- insert 1 + hunk 15 -- initial 2 + hunk 15 -- initial 3 ++hunk 15 -- insert 2 ++hunk 15 -- insert 0 + hunk 15 -- initial 4 + hunk 15 -- initial 5 + hunk 15 -- initial 6 ++hunk 15 -- insert 3 + hunk 15 -- initial 7 ++hunk 15 -- insert 4 + hunk 15 -- initial 8 + hunk 15 -- initial 9 + hunk 16 -- initial 0 +@@ -192,11 +207,16 @@ + hunk 19 -- initial 1 + hunk 19 -- initial 2 + hunk 19 -- initial 3 ++hunk 19 -- insert 3 ++hunk 19 -- insert 0 + hunk 19 -- initial 4 + hunk 19 -- initial 5 + hunk 19 -- initial 6 + hunk 19 -- initial 7 + hunk 19 -- initial 8 ++hunk 19 -- insert 1 ++hunk 19 -- insert 2 ++hunk 19 -- insert 4 + hunk 19 -- initial 9 + hunk 20 -- initial 0 + hunk 20 -- initial 1 ============================================================ --- tests/diff_output_formats/I.cd 45f80fe25d8530e0cba92232b431476e5b086b03 +++ tests/diff_output_formats/I.cd 45f80fe25d8530e0cba92232b431476e5b086b03 @@ -0,0 +1,232 @@ +*** I 4d32e91882cbb8a15c643265088861861bef0c16 +--- I ccdcc1ef902cf1c0082b992e731b057d30b40814 +*************** +*** 1,10 **** + hunk 0 -- initial 0 +- hunk 0 -- initial 1 +- hunk 0 -- initial 2 + hunk 0 -- initial 3 +- hunk 0 -- initial 4 +- hunk 0 -- initial 5 +- hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +--- 1,5 ---- +*************** +*** 19,31 **** + hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 +- hunk 2 -- initial 1 +- hunk 2 -- initial 2 + hunk 2 -- initial 3 +- hunk 2 -- initial 4 +- hunk 2 -- initial 5 + hunk 2 -- initial 6 +- hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 +--- 14,21 ---- +*************** +*** 48,62 **** + hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 +- hunk 5 -- initial 0 + hunk 5 -- initial 1 +- hunk 5 -- initial 2 + hunk 5 -- initial 3 +- hunk 5 -- initial 4 + hunk 5 -- initial 5 +- hunk 5 -- initial 6 + hunk 5 -- initial 7 +- hunk 5 -- initial 8 + hunk 5 -- initial 9 + hunk 6 -- initial 0 + hunk 6 -- initial 1 +--- 38,47 ---- +*************** +*** 69,109 **** + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 +- hunk 7 -- initial 1 +- hunk 7 -- initial 2 +- hunk 7 -- initial 3 + hunk 7 -- initial 4 + hunk 7 -- initial 5 +- hunk 7 -- initial 6 +- hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 +- hunk 8 -- initial 0 +- hunk 8 -- initial 1 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 +- hunk 8 -- initial 5 + hunk 8 -- initial 6 +- hunk 8 -- initial 7 +- hunk 8 -- initial 8 + hunk 8 -- initial 9 +- hunk 9 -- initial 0 + hunk 9 -- initial 1 +- hunk 9 -- initial 2 + hunk 9 -- initial 3 +- hunk 9 -- initial 4 +- hunk 9 -- initial 5 + hunk 9 -- initial 6 +- hunk 9 -- initial 7 + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 + hunk 10 -- initial 2 + hunk 10 -- initial 3 + hunk 10 -- initial 4 + hunk 10 -- initial 5 + hunk 10 -- initial 6 + hunk 10 -- initial 7 + hunk 10 -- initial 8 +--- 54,84 ---- + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 4 + hunk 7 -- initial 5 + hunk 7 -- initial 8 + hunk 7 -- initial 9 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 + hunk 8 -- initial 6 + hunk 8 -- initial 9 + hunk 9 -- initial 1 + hunk 9 -- initial 3 + hunk 9 -- initial 6 + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 ++ hunk 10 -- insert 3 + hunk 10 -- initial 2 + hunk 10 -- initial 3 ++ hunk 10 -- insert 2 + hunk 10 -- initial 4 ++ hunk 10 -- insert 0 + hunk 10 -- initial 5 ++ hunk 10 -- insert 4 ++ hunk 10 -- insert 1 + hunk 10 -- initial 6 + hunk 10 -- initial 7 + hunk 10 -- initial 8 +*************** +*** 138,146 **** +--- 113,126 ---- + hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 ++ hunk 14 -- insert 3 ++ hunk 14 -- insert 2 ++ hunk 14 -- insert 4 + hunk 14 -- initial 0 + hunk 14 -- initial 1 ++ hunk 14 -- insert 0 + hunk 14 -- initial 2 ++ hunk 14 -- insert 1 + hunk 14 -- initial 3 + hunk 14 -- initial 4 + hunk 14 -- initial 5 +*************** +*** 168,182 **** + hunk 16 -- initial 7 + hunk 16 -- initial 8 + hunk 16 -- initial 9 +- hunk 17 -- initial 0 + hunk 17 -- initial 1 + hunk 17 -- initial 2 + hunk 17 -- initial 3 +- hunk 17 -- initial 4 + hunk 17 -- initial 5 +- hunk 17 -- initial 6 +- hunk 17 -- initial 7 +- hunk 17 -- initial 8 + hunk 17 -- initial 9 + hunk 18 -- initial 0 + hunk 18 -- initial 1 +--- 148,157 ---- +*************** +*** 190,210 **** +--- 165,195 ---- + hunk 18 -- initial 9 + hunk 19 -- initial 0 + hunk 19 -- initial 1 ++ hunk 19 -- insert 0 ++ hunk 19 -- insert 1 + hunk 19 -- initial 2 + hunk 19 -- initial 3 + hunk 19 -- initial 4 + hunk 19 -- initial 5 + hunk 19 -- initial 6 ++ hunk 19 -- insert 3 + hunk 19 -- initial 7 ++ hunk 19 -- insert 2 + hunk 19 -- initial 8 ++ hunk 19 -- insert 4 + hunk 19 -- initial 9 + hunk 20 -- initial 0 + hunk 20 -- initial 1 ++ hunk 20 -- insert 0 + hunk 20 -- initial 2 + hunk 20 -- initial 3 ++ hunk 20 -- insert 3 + hunk 20 -- initial 4 + hunk 20 -- initial 5 + hunk 20 -- initial 6 ++ hunk 20 -- insert 1 ++ hunk 20 -- insert 4 ++ hunk 20 -- insert 2 + hunk 20 -- initial 7 + hunk 20 -- initial 8 + hunk 20 -- initial 9 +*************** +*** 219,234 **** +--- 204,227 ---- + hunk 21 -- initial 8 + hunk 21 -- initial 9 + hunk 22 -- initial 0 ++ hunk 22 -- insert 0 + hunk 22 -- initial 1 ++ hunk 22 -- insert 3 + hunk 22 -- initial 2 + hunk 22 -- initial 3 + hunk 22 -- initial 4 + hunk 22 -- initial 5 ++ hunk 22 -- insert 2 ++ hunk 22 -- insert 1 ++ hunk 22 -- insert 4 + hunk 22 -- initial 6 + hunk 22 -- initial 7 + hunk 22 -- initial 8 + hunk 22 -- initial 9 + hunk 23 -- initial 0 ++ hunk 23 -- insert 2 ++ hunk 23 -- insert 4 ++ hunk 23 -- insert 3 + hunk 23 -- initial 1 + hunk 23 -- initial 2 + hunk 23 -- initial 3 +*************** +*** 236,242 **** +--- 229,237 ---- + hunk 23 -- initial 5 + hunk 23 -- initial 6 + hunk 23 -- initial 7 ++ hunk 23 -- insert 1 + hunk 23 -- initial 8 ++ hunk 23 -- insert 0 + hunk 23 -- initial 9 + hunk 24 -- initial 0 + hunk 24 -- initial 1 ============================================================ --- tests/diff_output_formats/I.dst ccdcc1ef902cf1c0082b992e731b057d30b40814 +++ tests/diff_output_formats/I.dst ccdcc1ef902cf1c0082b992e731b057d30b40814 @@ -0,0 +1,255 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 3 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 3 +hunk 2 -- initial 6 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 1 +hunk 5 -- initial 3 +hunk 5 -- initial 5 +hunk 5 -- initial 7 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 6 +hunk 8 -- initial 9 +hunk 9 -- initial 1 +hunk 9 -- initial 3 +hunk 9 -- initial 6 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- insert 3 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- insert 2 +hunk 10 -- initial 4 +hunk 10 -- insert 0 +hunk 10 -- initial 5 +hunk 10 -- insert 4 +hunk 10 -- insert 1 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- insert 3 +hunk 14 -- insert 2 +hunk 14 -- insert 4 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- insert 0 +hunk 14 -- initial 2 +hunk 14 -- insert 1 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 5 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- insert 0 +hunk 19 -- insert 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- insert 3 +hunk 19 -- initial 7 +hunk 19 -- insert 2 +hunk 19 -- initial 8 +hunk 19 -- insert 4 +hunk 19 -- initial 9 +hunk 20 -- initial 0 +hunk 20 -- initial 1 +hunk 20 -- insert 0 +hunk 20 -- initial 2 +hunk 20 -- initial 3 +hunk 20 -- insert 3 +hunk 20 -- initial 4 +hunk 20 -- initial 5 +hunk 20 -- initial 6 +hunk 20 -- insert 1 +hunk 20 -- insert 4 +hunk 20 -- insert 2 +hunk 20 -- initial 7 +hunk 20 -- initial 8 +hunk 20 -- initial 9 +hunk 21 -- initial 0 +hunk 21 -- initial 1 +hunk 21 -- initial 2 +hunk 21 -- initial 3 +hunk 21 -- initial 4 +hunk 21 -- initial 5 +hunk 21 -- initial 6 +hunk 21 -- initial 7 +hunk 21 -- initial 8 +hunk 21 -- initial 9 +hunk 22 -- initial 0 +hunk 22 -- insert 0 +hunk 22 -- initial 1 +hunk 22 -- insert 3 +hunk 22 -- initial 2 +hunk 22 -- initial 3 +hunk 22 -- initial 4 +hunk 22 -- initial 5 +hunk 22 -- insert 2 +hunk 22 -- insert 1 +hunk 22 -- insert 4 +hunk 22 -- initial 6 +hunk 22 -- initial 7 +hunk 22 -- initial 8 +hunk 22 -- initial 9 +hunk 23 -- initial 0 +hunk 23 -- insert 2 +hunk 23 -- insert 4 +hunk 23 -- insert 3 +hunk 23 -- initial 1 +hunk 23 -- initial 2 +hunk 23 -- initial 3 +hunk 23 -- initial 4 +hunk 23 -- initial 5 +hunk 23 -- initial 6 +hunk 23 -- initial 7 +hunk 23 -- insert 1 +hunk 23 -- initial 8 +hunk 23 -- insert 0 +hunk 23 -- initial 9 +hunk 24 -- initial 0 +hunk 24 -- initial 1 +hunk 24 -- initial 2 +hunk 24 -- initial 3 +hunk 24 -- initial 4 +hunk 24 -- initial 5 +hunk 24 -- initial 6 +hunk 24 -- initial 7 +hunk 24 -- initial 8 +hunk 24 -- initial 9 +hunk 25 -- initial 0 +hunk 25 -- initial 1 +hunk 25 -- initial 2 +hunk 25 -- initial 3 +hunk 25 -- initial 4 +hunk 25 -- initial 5 +hunk 25 -- initial 6 +hunk 25 -- initial 7 +hunk 25 -- initial 8 +hunk 25 -- initial 9 ============================================================ --- tests/diff_output_formats/I.src 4d32e91882cbb8a15c643265088861861bef0c16 +++ tests/diff_output_formats/I.src 4d32e91882cbb8a15c643265088861861bef0c16 @@ -0,0 +1,260 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- initial 9 +hunk 20 -- initial 0 +hunk 20 -- initial 1 +hunk 20 -- initial 2 +hunk 20 -- initial 3 +hunk 20 -- initial 4 +hunk 20 -- initial 5 +hunk 20 -- initial 6 +hunk 20 -- initial 7 +hunk 20 -- initial 8 +hunk 20 -- initial 9 +hunk 21 -- initial 0 +hunk 21 -- initial 1 +hunk 21 -- initial 2 +hunk 21 -- initial 3 +hunk 21 -- initial 4 +hunk 21 -- initial 5 +hunk 21 -- initial 6 +hunk 21 -- initial 7 +hunk 21 -- initial 8 +hunk 21 -- initial 9 +hunk 22 -- initial 0 +hunk 22 -- initial 1 +hunk 22 -- initial 2 +hunk 22 -- initial 3 +hunk 22 -- initial 4 +hunk 22 -- initial 5 +hunk 22 -- initial 6 +hunk 22 -- initial 7 +hunk 22 -- initial 8 +hunk 22 -- initial 9 +hunk 23 -- initial 0 +hunk 23 -- initial 1 +hunk 23 -- initial 2 +hunk 23 -- initial 3 +hunk 23 -- initial 4 +hunk 23 -- initial 5 +hunk 23 -- initial 6 +hunk 23 -- initial 7 +hunk 23 -- initial 8 +hunk 23 -- initial 9 +hunk 24 -- initial 0 +hunk 24 -- initial 1 +hunk 24 -- initial 2 +hunk 24 -- initial 3 +hunk 24 -- initial 4 +hunk 24 -- initial 5 +hunk 24 -- initial 6 +hunk 24 -- initial 7 +hunk 24 -- initial 8 +hunk 24 -- initial 9 +hunk 25 -- initial 0 +hunk 25 -- initial 1 +hunk 25 -- initial 2 +hunk 25 -- initial 3 +hunk 25 -- initial 4 +hunk 25 -- initial 5 +hunk 25 -- initial 6 +hunk 25 -- initial 7 +hunk 25 -- initial 8 +hunk 25 -- initial 9 ============================================================ --- tests/diff_output_formats/I.ud 39db6ed118af85891b95113e216a622a7d60eb63 +++ tests/diff_output_formats/I.ud 39db6ed118af85891b95113e216a622a7d60eb63 @@ -0,0 +1,188 @@ +--- I 4d32e91882cbb8a15c643265088861861bef0c16 ++++ I ccdcc1ef902cf1c0082b992e731b057d30b40814 +@@ -1,10 +1,5 @@ + hunk 0 -- initial 0 +-hunk 0 -- initial 1 +-hunk 0 -- initial 2 + hunk 0 -- initial 3 +-hunk 0 -- initial 4 +-hunk 0 -- initial 5 +-hunk 0 -- initial 6 + hunk 0 -- initial 7 + hunk 0 -- initial 8 + hunk 0 -- initial 9 +@@ -19,13 +14,8 @@ + hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 +-hunk 2 -- initial 1 +-hunk 2 -- initial 2 + hunk 2 -- initial 3 +-hunk 2 -- initial 4 +-hunk 2 -- initial 5 + hunk 2 -- initial 6 +-hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 + hunk 3 -- initial 0 +@@ -48,15 +38,10 @@ + hunk 4 -- initial 7 + hunk 4 -- initial 8 + hunk 4 -- initial 9 +-hunk 5 -- initial 0 + hunk 5 -- initial 1 +-hunk 5 -- initial 2 + hunk 5 -- initial 3 +-hunk 5 -- initial 4 + hunk 5 -- initial 5 +-hunk 5 -- initial 6 + hunk 5 -- initial 7 +-hunk 5 -- initial 8 + hunk 5 -- initial 9 + hunk 6 -- initial 0 + hunk 6 -- initial 1 +@@ -69,41 +54,31 @@ + hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 +-hunk 7 -- initial 1 +-hunk 7 -- initial 2 +-hunk 7 -- initial 3 + hunk 7 -- initial 4 + hunk 7 -- initial 5 +-hunk 7 -- initial 6 +-hunk 7 -- initial 7 + hunk 7 -- initial 8 + hunk 7 -- initial 9 +-hunk 8 -- initial 0 +-hunk 8 -- initial 1 + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 +-hunk 8 -- initial 5 + hunk 8 -- initial 6 +-hunk 8 -- initial 7 +-hunk 8 -- initial 8 + hunk 8 -- initial 9 +-hunk 9 -- initial 0 + hunk 9 -- initial 1 +-hunk 9 -- initial 2 + hunk 9 -- initial 3 +-hunk 9 -- initial 4 +-hunk 9 -- initial 5 + hunk 9 -- initial 6 +-hunk 9 -- initial 7 + hunk 9 -- initial 8 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 ++hunk 10 -- insert 3 + hunk 10 -- initial 2 + hunk 10 -- initial 3 ++hunk 10 -- insert 2 + hunk 10 -- initial 4 ++hunk 10 -- insert 0 + hunk 10 -- initial 5 ++hunk 10 -- insert 4 ++hunk 10 -- insert 1 + hunk 10 -- initial 6 + hunk 10 -- initial 7 + hunk 10 -- initial 8 +@@ -138,9 +113,14 @@ + hunk 13 -- initial 7 + hunk 13 -- initial 8 + hunk 13 -- initial 9 ++hunk 14 -- insert 3 ++hunk 14 -- insert 2 ++hunk 14 -- insert 4 + hunk 14 -- initial 0 + hunk 14 -- initial 1 ++hunk 14 -- insert 0 + hunk 14 -- initial 2 ++hunk 14 -- insert 1 + hunk 14 -- initial 3 + hunk 14 -- initial 4 + hunk 14 -- initial 5 +@@ -168,15 +148,10 @@ + hunk 16 -- initial 7 + hunk 16 -- initial 8 + hunk 16 -- initial 9 +-hunk 17 -- initial 0 + hunk 17 -- initial 1 + hunk 17 -- initial 2 + hunk 17 -- initial 3 +-hunk 17 -- initial 4 + hunk 17 -- initial 5 +-hunk 17 -- initial 6 +-hunk 17 -- initial 7 +-hunk 17 -- initial 8 + hunk 17 -- initial 9 + hunk 18 -- initial 0 + hunk 18 -- initial 1 +@@ -190,21 +165,31 @@ + hunk 18 -- initial 9 + hunk 19 -- initial 0 + hunk 19 -- initial 1 ++hunk 19 -- insert 0 ++hunk 19 -- insert 1 + hunk 19 -- initial 2 + hunk 19 -- initial 3 + hunk 19 -- initial 4 + hunk 19 -- initial 5 + hunk 19 -- initial 6 ++hunk 19 -- insert 3 + hunk 19 -- initial 7 ++hunk 19 -- insert 2 + hunk 19 -- initial 8 ++hunk 19 -- insert 4 + hunk 19 -- initial 9 + hunk 20 -- initial 0 + hunk 20 -- initial 1 ++hunk 20 -- insert 0 + hunk 20 -- initial 2 + hunk 20 -- initial 3 ++hunk 20 -- insert 3 + hunk 20 -- initial 4 + hunk 20 -- initial 5 + hunk 20 -- initial 6 ++hunk 20 -- insert 1 ++hunk 20 -- insert 4 ++hunk 20 -- insert 2 + hunk 20 -- initial 7 + hunk 20 -- initial 8 + hunk 20 -- initial 9 +@@ -219,16 +204,24 @@ + hunk 21 -- initial 8 + hunk 21 -- initial 9 + hunk 22 -- initial 0 ++hunk 22 -- insert 0 + hunk 22 -- initial 1 ++hunk 22 -- insert 3 + hunk 22 -- initial 2 + hunk 22 -- initial 3 + hunk 22 -- initial 4 + hunk 22 -- initial 5 ++hunk 22 -- insert 2 ++hunk 22 -- insert 1 ++hunk 22 -- insert 4 + hunk 22 -- initial 6 + hunk 22 -- initial 7 + hunk 22 -- initial 8 + hunk 22 -- initial 9 + hunk 23 -- initial 0 ++hunk 23 -- insert 2 ++hunk 23 -- insert 4 ++hunk 23 -- insert 3 + hunk 23 -- initial 1 + hunk 23 -- initial 2 + hunk 23 -- initial 3 +@@ -236,7 +229,9 @@ + hunk 23 -- initial 5 + hunk 23 -- initial 6 + hunk 23 -- initial 7 ++hunk 23 -- insert 1 + hunk 23 -- initial 8 ++hunk 23 -- insert 0 + hunk 23 -- initial 9 + hunk 24 -- initial 0 + hunk 24 -- initial 1 ============================================================ --- tests/diff_output_formats/J.cd d81a80980c6eba5027990324da04f846fc3f9f3c +++ tests/diff_output_formats/J.cd d81a80980c6eba5027990324da04f846fc3f9f3c @@ -0,0 +1,211 @@ +*** J cc172a94441af071b19c3eddddc21053634e94bb +--- J 93462d067100103422a0e59722155b3a916770a2 +*************** +*** 19,41 **** + hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 + hunk 2 -- initial 4 + hunk 2 -- initial 5 + hunk 2 -- initial 6 + hunk 2 -- initial 7 + hunk 2 -- initial 8 + hunk 2 -- initial 9 +- hunk 3 -- initial 0 + hunk 3 -- initial 1 +- hunk 3 -- initial 2 + hunk 3 -- initial 3 +- hunk 3 -- initial 4 +- hunk 3 -- initial 5 + hunk 3 -- initial 6 +- hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 +--- 19,41 ---- + hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 ++ hunk 2 -- insert 4 + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 + hunk 2 -- initial 4 ++ hunk 2 -- insert 2 + hunk 2 -- initial 5 ++ hunk 2 -- insert 0 ++ hunk 2 -- insert 1 + hunk 2 -- initial 6 + hunk 2 -- initial 7 + hunk 2 -- initial 8 ++ hunk 2 -- insert 3 + hunk 2 -- initial 9 + hunk 3 -- initial 1 + hunk 3 -- initial 3 + hunk 3 -- initial 6 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 +*************** +*** 58,72 **** + hunk 5 -- initial 7 + hunk 5 -- initial 8 + hunk 5 -- initial 9 +- hunk 6 -- initial 0 +- hunk 6 -- initial 1 + hunk 6 -- initial 2 + hunk 6 -- initial 3 + hunk 6 -- initial 4 + hunk 6 -- initial 5 +- hunk 6 -- initial 6 +- hunk 6 -- initial 7 +- hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 1 +--- 58,67 ---- +*************** +*** 83,102 **** +--- 78,107 ---- + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 ++ hunk 8 -- insert 0 + hunk 8 -- initial 5 ++ hunk 8 -- insert 1 ++ hunk 8 -- insert 3 + hunk 8 -- initial 6 + hunk 8 -- initial 7 ++ hunk 8 -- insert 4 + hunk 8 -- initial 8 ++ hunk 8 -- insert 2 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 + hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 ++ hunk 9 -- insert 0 ++ hunk 9 -- insert 4 + hunk 9 -- initial 5 + hunk 9 -- initial 6 + hunk 9 -- initial 7 ++ hunk 9 -- insert 1 + hunk 9 -- initial 8 ++ hunk 9 -- insert 2 ++ hunk 9 -- insert 3 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 +*************** +*** 108,131 **** + hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 +- hunk 11 -- initial 0 + hunk 11 -- initial 1 +- hunk 11 -- initial 2 + hunk 11 -- initial 3 +- hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 +- hunk 11 -- initial 7 +- hunk 11 -- initial 8 + hunk 11 -- initial 9 +- hunk 12 -- initial 0 +- hunk 12 -- initial 1 +- hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 +- hunk 12 -- initial 6 +- hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +--- 113,126 ---- +*************** +*** 139,151 **** + hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 +- hunk 14 -- initial 1 +- hunk 14 -- initial 2 +- hunk 14 -- initial 3 + hunk 14 -- initial 4 +- hunk 14 -- initial 5 + hunk 14 -- initial 6 +- hunk 14 -- initial 7 + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 +--- 134,141 ---- +*************** +*** 182,192 **** +--- 172,187 ---- + hunk 18 -- initial 1 + hunk 18 -- initial 2 + hunk 18 -- initial 3 ++ hunk 18 -- insert 0 ++ hunk 18 -- insert 3 + hunk 18 -- initial 4 + hunk 18 -- initial 5 ++ hunk 18 -- insert 1 + hunk 18 -- initial 6 + hunk 18 -- initial 7 ++ hunk 18 -- insert 2 + hunk 18 -- initial 8 ++ hunk 18 -- insert 4 + hunk 18 -- initial 9 + hunk 19 -- initial 0 + hunk 19 -- initial 1 +*************** +*** 229,241 **** +--- 224,241 ---- + hunk 22 -- initial 8 + hunk 22 -- initial 9 + hunk 23 -- initial 0 ++ hunk 23 -- insert 3 + hunk 23 -- initial 1 + hunk 23 -- initial 2 ++ hunk 23 -- insert 2 + hunk 23 -- initial 3 ++ hunk 23 -- insert 1 + hunk 23 -- initial 4 + hunk 23 -- initial 5 + hunk 23 -- initial 6 + hunk 23 -- initial 7 ++ hunk 23 -- insert 0 ++ hunk 23 -- insert 4 + hunk 23 -- initial 8 + hunk 23 -- initial 9 + hunk 24 -- initial 0 +*************** +*** 250,272 **** + hunk 24 -- initial 9 + hunk 25 -- initial 0 + hunk 25 -- initial 1 +- hunk 25 -- initial 2 +- hunk 25 -- initial 3 +- hunk 25 -- initial 4 + hunk 25 -- initial 5 + hunk 25 -- initial 6 +- hunk 25 -- initial 7 +- hunk 25 -- initial 8 + hunk 25 -- initial 9 + hunk 26 -- initial 0 +- hunk 26 -- initial 1 +- hunk 26 -- initial 2 +- hunk 26 -- initial 3 + hunk 26 -- initial 4 + hunk 26 -- initial 5 + hunk 26 -- initial 6 +- hunk 26 -- initial 7 +- hunk 26 -- initial 8 + hunk 26 -- initial 9 + hunk 27 -- initial 0 + hunk 27 -- initial 1 +--- 250,262 ---- ============================================================ --- tests/diff_output_formats/J.dst 93462d067100103422a0e59722155b3a916770a2 +++ tests/diff_output_formats/J.dst 93462d067100103422a0e59722155b3a916770a2 @@ -0,0 +1,270 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- insert 4 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- insert 2 +hunk 2 -- initial 5 +hunk 2 -- insert 0 +hunk 2 -- insert 1 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- insert 3 +hunk 2 -- initial 9 +hunk 3 -- initial 1 +hunk 3 -- initial 3 +hunk 3 -- initial 6 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- insert 0 +hunk 8 -- initial 5 +hunk 8 -- insert 1 +hunk 8 -- insert 3 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- insert 4 +hunk 8 -- initial 8 +hunk 8 -- insert 2 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- insert 0 +hunk 9 -- insert 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- insert 1 +hunk 9 -- initial 8 +hunk 9 -- insert 2 +hunk 9 -- insert 3 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 1 +hunk 11 -- initial 3 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 9 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 4 +hunk 14 -- initial 6 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- insert 0 +hunk 18 -- insert 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- insert 1 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- insert 2 +hunk 18 -- initial 8 +hunk 18 -- insert 4 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- initial 9 +hunk 20 -- initial 0 +hunk 20 -- initial 1 +hunk 20 -- initial 2 +hunk 20 -- initial 3 +hunk 20 -- initial 4 +hunk 20 -- initial 5 +hunk 20 -- initial 6 +hunk 20 -- initial 7 +hunk 20 -- initial 8 +hunk 20 -- initial 9 +hunk 21 -- initial 0 +hunk 21 -- initial 1 +hunk 21 -- initial 2 +hunk 21 -- initial 3 +hunk 21 -- initial 4 +hunk 21 -- initial 5 +hunk 21 -- initial 6 +hunk 21 -- initial 7 +hunk 21 -- initial 8 +hunk 21 -- initial 9 +hunk 22 -- initial 0 +hunk 22 -- initial 1 +hunk 22 -- initial 2 +hunk 22 -- initial 3 +hunk 22 -- initial 4 +hunk 22 -- initial 5 +hunk 22 -- initial 6 +hunk 22 -- initial 7 +hunk 22 -- initial 8 +hunk 22 -- initial 9 +hunk 23 -- initial 0 +hunk 23 -- insert 3 +hunk 23 -- initial 1 +hunk 23 -- initial 2 +hunk 23 -- insert 2 +hunk 23 -- initial 3 +hunk 23 -- insert 1 +hunk 23 -- initial 4 +hunk 23 -- initial 5 +hunk 23 -- initial 6 +hunk 23 -- initial 7 +hunk 23 -- insert 0 +hunk 23 -- insert 4 +hunk 23 -- initial 8 +hunk 23 -- initial 9 +hunk 24 -- initial 0 +hunk 24 -- initial 1 +hunk 24 -- initial 2 +hunk 24 -- initial 3 +hunk 24 -- initial 4 +hunk 24 -- initial 5 +hunk 24 -- initial 6 +hunk 24 -- initial 7 +hunk 24 -- initial 8 +hunk 24 -- initial 9 +hunk 25 -- initial 0 +hunk 25 -- initial 1 +hunk 25 -- initial 5 +hunk 25 -- initial 6 +hunk 25 -- initial 9 +hunk 26 -- initial 0 +hunk 26 -- initial 4 +hunk 26 -- initial 5 +hunk 26 -- initial 6 +hunk 26 -- initial 9 +hunk 27 -- initial 0 +hunk 27 -- initial 1 +hunk 27 -- initial 2 +hunk 27 -- initial 3 +hunk 27 -- initial 4 +hunk 27 -- initial 5 +hunk 27 -- initial 6 +hunk 27 -- initial 7 +hunk 27 -- initial 8 +hunk 27 -- initial 9 ============================================================ --- tests/diff_output_formats/J.src cc172a94441af071b19c3eddddc21053634e94bb +++ tests/diff_output_formats/J.src cc172a94441af071b19c3eddddc21053634e94bb @@ -0,0 +1,280 @@ +hunk 0 -- initial 0 +hunk 0 -- initial 1 +hunk 0 -- initial 2 +hunk 0 -- initial 3 +hunk 0 -- initial 4 +hunk 0 -- initial 5 +hunk 0 -- initial 6 +hunk 0 -- initial 7 +hunk 0 -- initial 8 +hunk 0 -- initial 9 +hunk 1 -- initial 0 +hunk 1 -- initial 1 +hunk 1 -- initial 2 +hunk 1 -- initial 3 +hunk 1 -- initial 4 +hunk 1 -- initial 5 +hunk 1 -- initial 6 +hunk 1 -- initial 7 +hunk 1 -- initial 8 +hunk 1 -- initial 9 +hunk 2 -- initial 0 +hunk 2 -- initial 1 +hunk 2 -- initial 2 +hunk 2 -- initial 3 +hunk 2 -- initial 4 +hunk 2 -- initial 5 +hunk 2 -- initial 6 +hunk 2 -- initial 7 +hunk 2 -- initial 8 +hunk 2 -- initial 9 +hunk 3 -- initial 0 +hunk 3 -- initial 1 +hunk 3 -- initial 2 +hunk 3 -- initial 3 +hunk 3 -- initial 4 +hunk 3 -- initial 5 +hunk 3 -- initial 6 +hunk 3 -- initial 7 +hunk 3 -- initial 8 +hunk 3 -- initial 9 +hunk 4 -- initial 0 +hunk 4 -- initial 1 +hunk 4 -- initial 2 +hunk 4 -- initial 3 +hunk 4 -- initial 4 +hunk 4 -- initial 5 +hunk 4 -- initial 6 +hunk 4 -- initial 7 +hunk 4 -- initial 8 +hunk 4 -- initial 9 +hunk 5 -- initial 0 +hunk 5 -- initial 1 +hunk 5 -- initial 2 +hunk 5 -- initial 3 +hunk 5 -- initial 4 +hunk 5 -- initial 5 +hunk 5 -- initial 6 +hunk 5 -- initial 7 +hunk 5 -- initial 8 +hunk 5 -- initial 9 +hunk 6 -- initial 0 +hunk 6 -- initial 1 +hunk 6 -- initial 2 +hunk 6 -- initial 3 +hunk 6 -- initial 4 +hunk 6 -- initial 5 +hunk 6 -- initial 6 +hunk 6 -- initial 7 +hunk 6 -- initial 8 +hunk 6 -- initial 9 +hunk 7 -- initial 0 +hunk 7 -- initial 1 +hunk 7 -- initial 2 +hunk 7 -- initial 3 +hunk 7 -- initial 4 +hunk 7 -- initial 5 +hunk 7 -- initial 6 +hunk 7 -- initial 7 +hunk 7 -- initial 8 +hunk 7 -- initial 9 +hunk 8 -- initial 0 +hunk 8 -- initial 1 +hunk 8 -- initial 2 +hunk 8 -- initial 3 +hunk 8 -- initial 4 +hunk 8 -- initial 5 +hunk 8 -- initial 6 +hunk 8 -- initial 7 +hunk 8 -- initial 8 +hunk 8 -- initial 9 +hunk 9 -- initial 0 +hunk 9 -- initial 1 +hunk 9 -- initial 2 +hunk 9 -- initial 3 +hunk 9 -- initial 4 +hunk 9 -- initial 5 +hunk 9 -- initial 6 +hunk 9 -- initial 7 +hunk 9 -- initial 8 +hunk 9 -- initial 9 +hunk 10 -- initial 0 +hunk 10 -- initial 1 +hunk 10 -- initial 2 +hunk 10 -- initial 3 +hunk 10 -- initial 4 +hunk 10 -- initial 5 +hunk 10 -- initial 6 +hunk 10 -- initial 7 +hunk 10 -- initial 8 +hunk 10 -- initial 9 +hunk 11 -- initial 0 +hunk 11 -- initial 1 +hunk 11 -- initial 2 +hunk 11 -- initial 3 +hunk 11 -- initial 4 +hunk 11 -- initial 5 +hunk 11 -- initial 6 +hunk 11 -- initial 7 +hunk 11 -- initial 8 +hunk 11 -- initial 9 +hunk 12 -- initial 0 +hunk 12 -- initial 1 +hunk 12 -- initial 2 +hunk 12 -- initial 3 +hunk 12 -- initial 4 +hunk 12 -- initial 5 +hunk 12 -- initial 6 +hunk 12 -- initial 7 +hunk 12 -- initial 8 +hunk 12 -- initial 9 +hunk 13 -- initial 0 +hunk 13 -- initial 1 +hunk 13 -- initial 2 +hunk 13 -- initial 3 +hunk 13 -- initial 4 +hunk 13 -- initial 5 +hunk 13 -- initial 6 +hunk 13 -- initial 7 +hunk 13 -- initial 8 +hunk 13 -- initial 9 +hunk 14 -- initial 0 +hunk 14 -- initial 1 +hunk 14 -- initial 2 +hunk 14 -- initial 3 +hunk 14 -- initial 4 +hunk 14 -- initial 5 +hunk 14 -- initial 6 +hunk 14 -- initial 7 +hunk 14 -- initial 8 +hunk 14 -- initial 9 +hunk 15 -- initial 0 +hunk 15 -- initial 1 +hunk 15 -- initial 2 +hunk 15 -- initial 3 +hunk 15 -- initial 4 +hunk 15 -- initial 5 +hunk 15 -- initial 6 +hunk 15 -- initial 7 +hunk 15 -- initial 8 +hunk 15 -- initial 9 +hunk 16 -- initial 0 +hunk 16 -- initial 1 +hunk 16 -- initial 2 +hunk 16 -- initial 3 +hunk 16 -- initial 4 +hunk 16 -- initial 5 +hunk 16 -- initial 6 +hunk 16 -- initial 7 +hunk 16 -- initial 8 +hunk 16 -- initial 9 +hunk 17 -- initial 0 +hunk 17 -- initial 1 +hunk 17 -- initial 2 +hunk 17 -- initial 3 +hunk 17 -- initial 4 +hunk 17 -- initial 5 +hunk 17 -- initial 6 +hunk 17 -- initial 7 +hunk 17 -- initial 8 +hunk 17 -- initial 9 +hunk 18 -- initial 0 +hunk 18 -- initial 1 +hunk 18 -- initial 2 +hunk 18 -- initial 3 +hunk 18 -- initial 4 +hunk 18 -- initial 5 +hunk 18 -- initial 6 +hunk 18 -- initial 7 +hunk 18 -- initial 8 +hunk 18 -- initial 9 +hunk 19 -- initial 0 +hunk 19 -- initial 1 +hunk 19 -- initial 2 +hunk 19 -- initial 3 +hunk 19 -- initial 4 +hunk 19 -- initial 5 +hunk 19 -- initial 6 +hunk 19 -- initial 7 +hunk 19 -- initial 8 +hunk 19 -- initial 9 +hunk 20 -- initial 0 +hunk 20 -- initial 1 +hunk 20 -- initial 2 +hunk 20 -- initial 3 +hunk 20 -- initial 4 +hunk 20 -- initial 5 +hunk 20 -- initial 6 +hunk 20 -- initial 7 +hunk 20 -- initial 8 +hunk 20 -- initial 9 +hunk 21 -- initial 0 +hunk 21 -- initial 1 +hunk 21 -- initial 2 +hunk 21 -- initial 3 +hunk 21 -- initial 4 +hunk 21 -- initial 5 +hunk 21 -- initial 6 +hunk 21 -- initial 7 +hunk 21 -- initial 8 +hunk 21 -- initial 9 +hunk 22 -- initial 0 +hunk 22 -- initial 1 +hunk 22 -- initial 2 +hunk 22 -- initial 3 +hunk 22 -- initial 4 +hunk 22 -- initial 5 +hunk 22 -- initial 6 +hunk 22 -- initial 7 +hunk 22 -- initial 8 +hunk 22 -- initial 9 +hunk 23 -- initial 0 +hunk 23 -- initial 1 +hunk 23 -- initial 2 +hunk 23 -- initial 3 +hunk 23 -- initial 4 +hunk 23 -- initial 5 +hunk 23 -- initial 6 +hunk 23 -- initial 7 +hunk 23 -- initial 8 +hunk 23 -- initial 9 +hunk 24 -- initial 0 +hunk 24 -- initial 1 +hunk 24 -- initial 2 +hunk 24 -- initial 3 +hunk 24 -- initial 4 +hunk 24 -- initial 5 +hunk 24 -- initial 6 +hunk 24 -- initial 7 +hunk 24 -- initial 8 +hunk 24 -- initial 9 +hunk 25 -- initial 0 +hunk 25 -- initial 1 +hunk 25 -- initial 2 +hunk 25 -- initial 3 +hunk 25 -- initial 4 +hunk 25 -- initial 5 +hunk 25 -- initial 6 +hunk 25 -- initial 7 +hunk 25 -- initial 8 +hunk 25 -- initial 9 +hunk 26 -- initial 0 +hunk 26 -- initial 1 +hunk 26 -- initial 2 +hunk 26 -- initial 3 +hunk 26 -- initial 4 +hunk 26 -- initial 5 +hunk 26 -- initial 6 +hunk 26 -- initial 7 +hunk 26 -- initial 8 +hunk 26 -- initial 9 +hunk 27 -- initial 0 +hunk 27 -- initial 1 +hunk 27 -- initial 2 +hunk 27 -- initial 3 +hunk 27 -- initial 4 +hunk 27 -- initial 5 +hunk 27 -- initial 6 +hunk 27 -- initial 7 +hunk 27 -- initial 8 +hunk 27 -- initial 9 ============================================================ --- tests/diff_output_formats/J.ud dabba4fee19e7f11048c289796e4f836000c517b +++ tests/diff_output_formats/J.ud dabba4fee19e7f11048c289796e4f836000c517b @@ -0,0 +1,177 @@ +--- J cc172a94441af071b19c3eddddc21053634e94bb ++++ J 93462d067100103422a0e59722155b3a916770a2 +@@ -19,23 +19,23 @@ + hunk 1 -- initial 8 + hunk 1 -- initial 9 + hunk 2 -- initial 0 ++hunk 2 -- insert 4 + hunk 2 -- initial 1 + hunk 2 -- initial 2 + hunk 2 -- initial 3 + hunk 2 -- initial 4 ++hunk 2 -- insert 2 + hunk 2 -- initial 5 ++hunk 2 -- insert 0 ++hunk 2 -- insert 1 + hunk 2 -- initial 6 + hunk 2 -- initial 7 + hunk 2 -- initial 8 ++hunk 2 -- insert 3 + hunk 2 -- initial 9 +-hunk 3 -- initial 0 + hunk 3 -- initial 1 +-hunk 3 -- initial 2 + hunk 3 -- initial 3 +-hunk 3 -- initial 4 +-hunk 3 -- initial 5 + hunk 3 -- initial 6 +-hunk 3 -- initial 7 + hunk 3 -- initial 8 + hunk 3 -- initial 9 + hunk 4 -- initial 0 +@@ -58,15 +58,10 @@ + hunk 5 -- initial 7 + hunk 5 -- initial 8 + hunk 5 -- initial 9 +-hunk 6 -- initial 0 +-hunk 6 -- initial 1 + hunk 6 -- initial 2 + hunk 6 -- initial 3 + hunk 6 -- initial 4 + hunk 6 -- initial 5 +-hunk 6 -- initial 6 +-hunk 6 -- initial 7 +-hunk 6 -- initial 8 + hunk 6 -- initial 9 + hunk 7 -- initial 0 + hunk 7 -- initial 1 +@@ -83,20 +78,30 @@ + hunk 8 -- initial 2 + hunk 8 -- initial 3 + hunk 8 -- initial 4 ++hunk 8 -- insert 0 + hunk 8 -- initial 5 ++hunk 8 -- insert 1 ++hunk 8 -- insert 3 + hunk 8 -- initial 6 + hunk 8 -- initial 7 ++hunk 8 -- insert 4 + hunk 8 -- initial 8 ++hunk 8 -- insert 2 + hunk 8 -- initial 9 + hunk 9 -- initial 0 + hunk 9 -- initial 1 + hunk 9 -- initial 2 + hunk 9 -- initial 3 + hunk 9 -- initial 4 ++hunk 9 -- insert 0 ++hunk 9 -- insert 4 + hunk 9 -- initial 5 + hunk 9 -- initial 6 + hunk 9 -- initial 7 ++hunk 9 -- insert 1 + hunk 9 -- initial 8 ++hunk 9 -- insert 2 ++hunk 9 -- insert 3 + hunk 9 -- initial 9 + hunk 10 -- initial 0 + hunk 10 -- initial 1 +@@ -108,24 +113,14 @@ + hunk 10 -- initial 7 + hunk 10 -- initial 8 + hunk 10 -- initial 9 +-hunk 11 -- initial 0 + hunk 11 -- initial 1 +-hunk 11 -- initial 2 + hunk 11 -- initial 3 +-hunk 11 -- initial 4 + hunk 11 -- initial 5 + hunk 11 -- initial 6 +-hunk 11 -- initial 7 +-hunk 11 -- initial 8 + hunk 11 -- initial 9 +-hunk 12 -- initial 0 +-hunk 12 -- initial 1 +-hunk 12 -- initial 2 + hunk 12 -- initial 3 + hunk 12 -- initial 4 + hunk 12 -- initial 5 +-hunk 12 -- initial 6 +-hunk 12 -- initial 7 + hunk 12 -- initial 8 + hunk 12 -- initial 9 + hunk 13 -- initial 0 +@@ -139,13 +134,8 @@ + hunk 13 -- initial 8 + hunk 13 -- initial 9 + hunk 14 -- initial 0 +-hunk 14 -- initial 1 +-hunk 14 -- initial 2 +-hunk 14 -- initial 3 + hunk 14 -- initial 4 +-hunk 14 -- initial 5 + hunk 14 -- initial 6 +-hunk 14 -- initial 7 + hunk 14 -- initial 8 + hunk 14 -- initial 9 + hunk 15 -- initial 0 +@@ -182,11 +172,16 @@ + hunk 18 -- initial 1 + hunk 18 -- initial 2 + hunk 18 -- initial 3 ++hunk 18 -- insert 0 ++hunk 18 -- insert 3 + hunk 18 -- initial 4 + hunk 18 -- initial 5 ++hunk 18 -- insert 1 + hunk 18 -- initial 6 + hunk 18 -- initial 7 ++hunk 18 -- insert 2 + hunk 18 -- initial 8 ++hunk 18 -- insert 4 + hunk 18 -- initial 9 + hunk 19 -- initial 0 + hunk 19 -- initial 1 +@@ -229,13 +224,18 @@ + hunk 22 -- initial 8 + hunk 22 -- initial 9 + hunk 23 -- initial 0 ++hunk 23 -- insert 3 + hunk 23 -- initial 1 + hunk 23 -- initial 2 ++hunk 23 -- insert 2 + hunk 23 -- initial 3 ++hunk 23 -- insert 1 + hunk 23 -- initial 4 + hunk 23 -- initial 5 + hunk 23 -- initial 6 + hunk 23 -- initial 7 ++hunk 23 -- insert 0 ++hunk 23 -- insert 4 + hunk 23 -- initial 8 + hunk 23 -- initial 9 + hunk 24 -- initial 0 +@@ -250,23 +250,13 @@ + hunk 24 -- initial 9 + hunk 25 -- initial 0 + hunk 25 -- initial 1 +-hunk 25 -- initial 2 +-hunk 25 -- initial 3 +-hunk 25 -- initial 4 + hunk 25 -- initial 5 + hunk 25 -- initial 6 +-hunk 25 -- initial 7 +-hunk 25 -- initial 8 + hunk 25 -- initial 9 + hunk 26 -- initial 0 +-hunk 26 -- initial 1 +-hunk 26 -- initial 2 +-hunk 26 -- initial 3 + hunk 26 -- initial 4 + hunk 26 -- initial 5 + hunk 26 -- initial 6 +-hunk 26 -- initial 7 +-hunk 26 -- initial 8 + hunk 26 -- initial 9 + hunk 27 -- initial 0 + hunk 27 -- initial 1 ============================================================ --- tests/diff_output_formats/__driver__.lua 17d8d713c190f1a91fdf10ce0702d7a0aacc5b09 +++ tests/diff_output_formats/__driver__.lua 17d8d713c190f1a91fdf10ce0702d7a0aacc5b09 @@ -0,0 +1,31 @@ +function test_one(base) + local src = base .. ".src" + local dst = base .. ".dst" + local ud = base .. ".ud" + local cd = base .. ".cd" + if not get(src) or not get(dst) or not get(ud) or not get(cd) then + error("case '" .. base .. "': missing file", 2) + return + end + check(mtn("fload"), 0, nil, nil, {src}) + check(mtn("fload"), 0, nil, nil, {dst}) + src = sha1(src) + dst = sha1(dst) + + check(mtn("fdiff", base, base, src, dst), 0, {ud}, nil, nil) + check(mtn("fdiff", "--context", base, base, src, dst), 0, {cd}, nil, nil) +end + +mtn_setup() + +test_one("hello") +test_one("A") +test_one("B") +test_one("C") +test_one("D") +test_one("E") +test_one("F") +test_one("G") +test_one("H") +test_one("I") +test_one("J") ============================================================ --- tests/diff_output_formats/hello.cd eaa3e49d306b120a98b25ed7fd265948d5d9212c +++ tests/diff_output_formats/hello.cd eaa3e49d306b120a98b25ed7fd265948d5d9212c @@ -0,0 +1,14 @@ +*** hello 80ad86578e12a12c838cd4ff7ca226aa6bcc44e9 +--- hello 94ebfe438b30bf18631c1846b2891b818f46aa23 +*************** +*** 9,11 **** +--- 9,17 ---- + { + say_hello(); + } ++ ++ void say_goodbye() ++ { ++ printf("goodbye\n"); ++ } ++ ============================================================ --- tests/diff_output_formats/hello.dst 94ebfe438b30bf18631c1846b2891b818f46aa23 +++ tests/diff_output_formats/hello.dst 94ebfe438b30bf18631c1846b2891b818f46aa23 @@ -0,0 +1,17 @@ +#include "hello.h" + +void say_hello() +{ + printf("hello, world\n"); +} + +int main() +{ + say_hello(); +} + +void say_goodbye() +{ + printf("goodbye\n"); +} + ============================================================ --- tests/diff_output_formats/hello.src 80ad86578e12a12c838cd4ff7ca226aa6bcc44e9 +++ tests/diff_output_formats/hello.src 80ad86578e12a12c838cd4ff7ca226aa6bcc44e9 @@ -0,0 +1,11 @@ +#include "hello.h" + +void say_hello() +{ + printf("hello, world\n"); +} + +int main() +{ + say_hello(); +} ============================================================ --- tests/diff_output_formats/hello.ud f94d586a2a50808c101ea613684f539c9a83b158 +++ tests/diff_output_formats/hello.ud f94d586a2a50808c101ea613684f539c9a83b158 @@ -0,0 +1,12 @@ +--- hello 80ad86578e12a12c838cd4ff7ca226aa6bcc44e9 ++++ hello 94ebfe438b30bf18631c1846b2891b818f46aa23 +@@ -9,3 +9,9 @@ + { + say_hello(); + } ++ ++void say_goodbye() ++{ ++ printf("goodbye\n"); ++} ++ ============================================================ --- cmd_files.cc 808056118d77c0d6ac4350e7a2fb5cd54dce81d7 +++ cmd_files.cc 70e0e2c4dc56071a62ca9cbc27b7e4d019ba8ce3 @@ -22,7 +22,7 @@ using std::string; using std::vector; -// fload and fmerge are simple commands for debugging the line +// fload, fmerge, and fdiff are simple commands for debugging the line // merger. CMD(fload, N_("debug"), "", N_("load file contents into db"), OPT_NONE) @@ -75,6 +75,38 @@ } +CMD(fdiff, N_("debug"), N_("[-c|-u] [-p] "), + N_("diff 2 files and output result"), + OPT_CONTEXT_DIFF % OPT_UNIFIED_DIFF) +{ + if (args.size() != 4) + throw usage(name); + + string const + & src_name = idx(args, 0)(), + & dst_name = idx(args, 1)(); + + file_id + src_id(idx(args, 2)()), + dst_id(idx(args, 3)()); + + file_data src, dst; + + N(app.db.file_version_exists (src_id), + F("source file id does not exist")); + + N(app.db.file_version_exists (dst_id), + F("destination file id does not exist")); + + app.db.get_file_version(src_id, src); + app.db.get_file_version(dst_id, dst); + + make_diff(src_name, dst_name, + src_id, dst_id, + src.inner(), dst.inner(), + cout, app.diff_format); +} + CMD(annotate, N_("informative"), N_("PATH"), N_("print annotated copy of the file from REVISION"), OPT_REVISION % OPT_BRIEF) ============================================================ --- diff_patch.cc 76a1560eb3c74a1854280b871de9cf7aa67c56bc +++ diff_patch.cc 407da19b586420a2a7bd78689c1cac7848cf7ffc @@ -943,6 +943,12 @@ struct cxtdiff_hunk_writer : public hunk_consumer { + // For context diffs, we have to queue up calls to insert_at/delete_at + // until we hit an advance_to, so that we can get the tags right: an + // unpaired insert gets a + in the left margin, an unpaired delete a -, + // but if they are paired, they both get !. Hence, we have both the + // 'inserts' and 'deletes' queues of line numbers, and the 'from_file' and + // 'to_file' queues of line strings. vector const & a; vector const & b; size_t ctx; @@ -1070,6 +1076,12 @@ void cxtdiff_hunk_writer::advance_to(size_t newpos) { + // We must first flush out pending mods because otherwise our calculation + // of whether we need to generate a new hunk header will be way off. + // It is correct (i.e. consistent with diff(1)) to reset the +/-/! + // generation algorithm between sub-components of a single hunk. + flush_pending_mods(); + if (a_begin + a_len + (2 * ctx) < newpos) { flush_hunk(newpos); @@ -1095,17 +1107,14 @@ } } else - { - flush_pending_mods(); - // pad intermediate context - while (a_begin + a_len < newpos) - { - from_file.push_back(string(" ") + a[a_begin + a_len]); - to_file.push_back(string(" ") + a[a_begin + a_len]); - a_len++; - b_len++; - } - } + // pad intermediate context + while (a_begin + a_len < newpos) + { + from_file.push_back(string(" ") + a[a_begin + a_len]); + to_file.push_back(string(" ") + a[a_begin + a_len]); + a_len++; + b_len++; + } } void make_diff(string const & filename1, @@ -1258,65 +1267,6 @@ } } -// regression blockers go here -static void unidiff_append_test() -{ - string src(string("#include \"hello.h\"\n") - + "\n" - + "void say_hello()\n" - + "{\n" - + " printf(\"hello, world\\n\");\n" - + "}\n" - + "\n" - + "int main()\n" - + "{\n" - + " say_hello();\n" - + "}\n"); - - string dst(string("#include \"hello.h\"\n") - + "\n" - + "void say_hello()\n" - + "{\n" - + " printf(\"hello, world\\n\");\n" - + "}\n" - + "\n" - + "int main()\n" - + "{\n" - + " say_hello();\n" - + "}\n" - + "\n" - + "void say_goodbye()\n" - + "{\n" - + " printf(\"goodbye\\n\");\n" - + "}\n" - + "\n"); - - string ud(string("--- hello.c\t0123456789abcdef0123456789abcdef01234567\n") - + "+++ hello.c\tabcdef0123456789abcdef0123456789abcdef01\n" - + "@@ -9,3 +9,9 @@\n" - + " {\n" - + " say_hello();\n" - + " }\n" - + "+\n" - + "+void say_goodbye()\n" - + "+{\n" - + "+ printf(\"goodbye\\n\");\n" - + "+}\n" - + "+\n"); - - vector src_lines, dst_lines; - split_into_lines(src, src_lines); - split_into_lines(dst, dst_lines); - stringstream sst; - make_diff("hello.c", "hello.c", - file_id(id("0123456789abcdef0123456789abcdef01234567")), - file_id(id("abcdef0123456789abcdef0123456789abcdef01")), - src_lines, dst_lines, sst, unified_diff); - cout << sst.str() << endl; - BOOST_CHECK(sst.str() == ud); -} - - // high tech randomizing test static void randomizing_merge_test() @@ -1459,7 +1409,6 @@ void add_diff_patch_tests(test_suite * suite) { I(suite); - suite->add(BOOST_TEST_CASE(&unidiff_append_test)); suite->add(BOOST_TEST_CASE(&merge_prepend_test)); suite->add(BOOST_TEST_CASE(&merge_append_test)); suite->add(BOOST_TEST_CASE(&merge_additions_test)); ============================================================ --- testsuite.lua d905626236ef9c395cb971c3e592cfe56c704015 +++ testsuite.lua c37d2385d0fdb4cd7c26f3a57bce7afa4290a92f @@ -400,7 +400,6 @@ table.insert(tests, "revert_directories") table.insert(tests, "revert_renames") table.insert(tests, "revert_unchanged_file_preserves_mtime") -table.insert(tests, "(minor)_context_diff") table.insert(tests, "rename_cannot_overwrite_files") table.insert(tests, "failed_checkout_is_a_no-op") table.insert(tests, "(todo)_write_monotone-agent") @@ -646,3 +645,4 @@ table.insert(tests, "automate_branches") table.insert(tests, "merge_conflict_with_no_lca") table.insert(tests, "pluck_basics") +table.insert(tests, "diff_output_formats")