t - git-rediff - [Complete] Reduce partially resolved merge conflicts

Mode	Name	Size
-rwxr-xr-x	all-positive-options-merge	340	log stats plain blame
-rwxr-xr-x	all-positive-options-select-head	346	log stats plain blame
-rwxr-xr-x	all-positive-options-select-tail	346	log stats plain blame
-rwxr-xr-x	all-positive-options-symmetric	344	log stats plain blame
-rwxr-xr-x	combination-2-interactive	291	log stats plain blame
-rwxr-xr-x	combination-2-merge	256	log stats plain blame
-rwxr-xr-x	combination-2-remove-base	360	log stats plain blame
-rwxr-xr-x	combination-2-select-head	289	log stats plain blame
-rwxr-xr-x	combination-2-select-tail	291	log stats plain blame
-rwxr-xr-x	combination-2-symmetric	279	log stats plain blame
-rwxr-xr-x	combination-interactive-2-no-interactive	435	log stats plain blame
-rwxr-xr-x	combination-merge-2-no-merge	366	log stats plain blame
-rwxr-xr-x	combination-merge-reduce	479	log stats plain blame
-rwxr-xr-x	combination-remove-base-2-no-remove-base	388	log stats plain blame
-rwxr-xr-x	combination-remove-base-merge-reduce	465	log stats plain blame
-rwxr-xr-x	combination-remove-base-reduce	509	log stats plain blame
-rwxr-xr-x	combination-remove-base-select-head-reduce	254	log stats plain blame
-rwxr-xr-x	combination-remove-base-select-tail-reduce	256	log stats plain blame
-rwxr-xr-x	combination-remove-base-symmetric-reduce	465	log stats plain blame
-rwxr-xr-x	combination-select-head-2-no-select-head	388	log stats plain blame
-rwxr-xr-x	combination-select-head-reduce	395	log stats plain blame
-rwxr-xr-x	combination-select-tail-2-no-select-tail	388	log stats plain blame
-rwxr-xr-x	combination-select-tail-reduce	397	log stats plain blame
-rwxr-xr-x	combination-symmetric-2-no-symmetric	371	log stats plain blame
-rwxr-xr-x	combination-symmetric-reduce	479	log stats plain blame
-rw-r--r--	common.sh	2772	log stats plain blame
-rwxr-xr-x	interactive-edit	1541	log stats plain blame
-rwxr-xr-x	interactive-help	511	log stats plain blame
-rwxr-xr-x	interactive-multiple-commands	2214	log stats plain blame
-rwxr-xr-x	interactive-short-option	913	log stats plain blame
-rwxr-xr-x	interactive-skip	524	log stats plain blame
-rwxr-xr-x	interactive-two-files	856	log stats plain blame
-rwxr-xr-x	invalid-option-combinations	3089	log stats plain blame
-rwxr-xr-x	marker-size-10	221	log stats plain blame
-rwxr-xr-x	marker-size-3	221	log stats plain blame
-rwxr-xr-x	marker-size-longer-ignored	234	log stats plain blame
-rwxr-xr-x	marker-size-shorter-ignored	224	log stats plain blame
-rwxr-xr-x	merge-1	150	log stats plain blame
-rwxr-xr-x	merge-2-different	198	log stats plain blame
-rwxr-xr-x	merge-2-identical	196	log stats plain blame
-rwxr-xr-x	merge-base	218	log stats plain blame
-rwxr-xr-x	merge-empty-base	216	log stats plain blame
-rwxr-xr-x	merge-empty-head	207	log stats plain blame
-rwxr-xr-x	merge-empty-tail	207	log stats plain blame
-rwxr-xr-x	merge-head	234	log stats plain blame
-rwxr-xr-x	merge-head-4	259	log stats plain blame
-rwxr-xr-x	merge-lower-middle-4	361	log stats plain blame
-rwxr-xr-x	merge-multiple-conflicts	469	log stats plain blame
-rwxr-xr-x	merge-multiple-files	451	log stats plain blame
-rwxr-xr-x	merge-no-conflicts	145	log stats plain blame
-rwxr-xr-x	merge-short-option	240	log stats plain blame
-rwxr-xr-x	merge-tail	234	log stats plain blame
-rwxr-xr-x	merge-tail-4	259	log stats plain blame
-rwxr-xr-x	merge-upper-middle-4	361	log stats plain blame
-rwxr-xr-x	missing-newline-non-conflict	138	log stats plain blame
-rwxr-xr-x	mixed-marker-sizes	427	log stats plain blame
-rwxr-xr-x	no-option-interactive	405	log stats plain blame
-rwxr-xr-x	no-option-interactive-no-yes	293	log stats plain blame
-rwxr-xr-x	no-option-interactive-yes-no	282	log stats plain blame
-rwxr-xr-x	no-option-merge	341	log stats plain blame
-rwxr-xr-x	no-option-merge-no-yes	242	log stats plain blame
-rwxr-xr-x	no-option-merge-yes-no	220	log stats plain blame
-rwxr-xr-x	no-option-reduce	242	log stats plain blame
-rwxr-xr-x	no-option-reduce-no-yes	360	log stats plain blame
-rwxr-xr-x	no-option-reduce-yes-no	251	log stats plain blame
-rwxr-xr-x	no-option-remove-base	357	log stats plain blame
-rwxr-xr-x	no-option-remove-base-no-yes	323	log stats plain blame
-rwxr-xr-x	no-option-remove-base-yes-no	351	log stats plain blame
-rwxr-xr-x	no-option-select-head	357	log stats plain blame
-rwxr-xr-x	no-option-select-head-no-yes	260	log stats plain blame
-rwxr-xr-x	no-option-select-head-yes-no	249	log stats plain blame
-rwxr-xr-x	no-option-select-head-yes-then-select-tail-yes-no	274	log stats plain blame
-rwxr-xr-x	no-option-select-tail	357	log stats plain blame
-rwxr-xr-x	no-option-select-tail-no-yes	262	log stats plain blame
-rwxr-xr-x	no-option-select-tail-yes-no	249	log stats plain blame
-rwxr-xr-x	no-option-select-tail-yes-then-select-head-yes-no	276	log stats plain blame
-rwxr-xr-x	no-option-symmetric	344	log stats plain blame
-rwxr-xr-x	no-option-symmetric-no-yes	250	log stats plain blame
-rwxr-xr-x	no-option-symmetric-yes-no	243	log stats plain blame
-rwxr-xr-x	no-reduce	204	log stats plain blame
-rwxr-xr-x	no-reduce-1	136	log stats plain blame
-rwxr-xr-x	no-reduce-2-files	318	log stats plain blame
-rwxr-xr-x	no-reduce-2-full	264	log stats plain blame
-rwxr-xr-x	no-reduce-2-head	326	log stats plain blame
-rwxr-xr-x	no-reduce-2-hunks	272	log stats plain blame
-rwxr-xr-x	no-reduce-2-middle	460	log stats plain blame
-rwxr-xr-x	no-reduce-2-multiple-partial	596	log stats plain blame
-rwxr-xr-x	no-reduce-2-non-aligned	458	log stats plain blame
-rwxr-xr-x	no-reduce-2-none	240	log stats plain blame
-rwxr-xr-x	no-reduce-2-tail	326	log stats plain blame
-rwxr-xr-x	no-reduce-3-full	330	log stats plain blame
-rwxr-xr-x	no-reduce-3-head	423	log stats plain blame
-rwxr-xr-x	no-reduce-3-middle	624	log stats plain blame
-rwxr-xr-x	no-reduce-3-multiple-partial	828	log stats plain blame
-rwxr-xr-x	no-reduce-3-none	294	log stats plain blame
-rwxr-xr-x	no-reduce-3-tail	423	log stats plain blame
-rwxr-xr-x	no-reduce-4-full	396	log stats plain blame
-rwxr-xr-x	no-reduce-4-head	520	log stats plain blame
-rwxr-xr-x	no-reduce-4-middle	788	log stats plain blame
-rwxr-xr-x	no-reduce-4-multiple-partial	1060	log stats plain blame
-rwxr-xr-x	no-reduce-4-none	348	log stats plain blame
-rwxr-xr-x	no-reduce-4-tail	520	log stats plain blame
-rwxr-xr-x	no-reduce-5-full	462	log stats plain blame
-rwxr-xr-x	no-reduce-5-head	617	log stats plain blame
-rwxr-xr-x	no-reduce-5-middle	952	log stats plain blame
-rwxr-xr-x	no-reduce-5-multiple-partial	1292	log stats plain blame
-rwxr-xr-x	no-reduce-5-none	402	log stats plain blame
-rwxr-xr-x	no-reduce-5-tail	617	log stats plain blame
-rwxr-xr-x	no-reduce-dashdash-dashprefix	211	log stats plain blame
-rwxr-xr-x	no-reduce-empty-base	212	log stats plain blame
-rwxr-xr-x	no-reduce-empty-head	212	log stats plain blame
-rwxr-xr-x	no-reduce-empty-tail	212	log stats plain blame
-rwxr-xr-x	no-reduce-no-conflicts	137	log stats plain blame
-rwxr-xr-x	null-bytes	271	log stats plain blame
-rwxr-xr-x	reduce-1	107	log stats plain blame
-rwxr-xr-x	reduce-2-files	341	log stats plain blame
-rwxr-xr-x	reduce-2-full	313	log stats plain blame
-rwxr-xr-x	reduce-2-head	490	log stats plain blame
-rwxr-xr-x	reduce-2-hunks	302	log stats plain blame
-rwxr-xr-x	reduce-2-middle	799	log stats plain blame
-rwxr-xr-x	reduce-2-multiple-partial	985	log stats plain blame
-rwxr-xr-x	reduce-2-non-aligned	748	log stats plain blame
-rwxr-xr-x	reduce-2-none	361	log stats plain blame
-rwxr-xr-x	reduce-2-tail	490	log stats plain blame
-rwxr-xr-x	reduce-3-full	379	log stats plain blame
-rwxr-xr-x	reduce-3-head	641	log stats plain blame
-rwxr-xr-x	reduce-3-middle	1097	log stats plain blame
-rwxr-xr-x	reduce-3-multiple-partial	1333	log stats plain blame
-rwxr-xr-x	reduce-3-none	469	log stats plain blame
-rwxr-xr-x	reduce-3-tail	641	log stats plain blame
-rwxr-xr-x	reduce-4-full	445	log stats plain blame
-rwxr-xr-x	reduce-4-head	792	log stats plain blame
-rwxr-xr-x	reduce-4-middle	1395	log stats plain blame
-rwxr-xr-x	reduce-4-multiple-partial	1681	log stats plain blame
-rwxr-xr-x	reduce-4-none	577	log stats plain blame
-rwxr-xr-x	reduce-4-tail	792	log stats plain blame
-rwxr-xr-x	reduce-5-full	511	log stats plain blame
-rwxr-xr-x	reduce-5-head	943	log stats plain blame
-rwxr-xr-x	reduce-5-middle	1693	log stats plain blame
-rwxr-xr-x	reduce-5-multiple-partial	2029	log stats plain blame
-rwxr-xr-x	reduce-5-none	685	log stats plain blame
-rwxr-xr-x	reduce-5-tail	943	log stats plain blame
-rwxr-xr-x	reduce-empty-base	209	log stats plain blame
-rwxr-xr-x	reduce-empty-head	209	log stats plain blame
-rwxr-xr-x	reduce-empty-tail	209	log stats plain blame
-rwxr-xr-x	reduce-is-default	272	log stats plain blame
-rwxr-xr-x	reduce-no-conflicts	134	log stats plain blame
-rwxr-xr-x	reduce-short-option	362	log stats plain blame
-rwxr-xr-x	remove-base-1	169	log stats plain blame
-rwxr-xr-x	remove-base-2	204	log stats plain blame
-rwxr-xr-x	remove-base-3	306	log stats plain blame
-rwxr-xr-x	remove-base-3-empty-base	298	log stats plain blame
-rwxr-xr-x	remove-base-3-empty-head	290	log stats plain blame
-rwxr-xr-x	remove-base-3-empty-tail	286	log stats plain blame
-rwxr-xr-x	remove-base-4	253	log stats plain blame
-rwxr-xr-x	remove-base-5	280	log stats plain blame
-rwxr-xr-x	remove-base-multiple-files	487	log stats plain blame
-rwxr-xr-x	remove-base-multiple-hunks	517	log stats plain blame
-rwxr-xr-x	remove-base-no-conflicts	164	log stats plain blame
-rwxr-xr-x	select-head-1	169	log stats plain blame
-rwxr-xr-x	select-head-2	211	log stats plain blame
-rwxr-xr-x	select-head-3	243	log stats plain blame
-rwxr-xr-x	select-head-3-empty-base	218	log stats plain blame
-rwxr-xr-x	select-head-3-empty-head	231	log stats plain blame
-rwxr-xr-x	select-head-3-empty-tail	222	log stats plain blame
-rwxr-xr-x	select-head-4	291	log stats plain blame
-rwxr-xr-x	select-head-multiple-files	442	log stats plain blame
-rwxr-xr-x	select-head-multiple-hunks	395	log stats plain blame
-rwxr-xr-x	select-head-no-conflicts	164	log stats plain blame
-rwxr-xr-x	select-tail-1	169	log stats plain blame
-rwxr-xr-x	select-tail-2	211	log stats plain blame
-rwxr-xr-x	select-tail-3	245	log stats plain blame
-rwxr-xr-x	select-tail-3-empty-base	237	log stats plain blame
-rwxr-xr-x	select-tail-3-empty-head	237	log stats plain blame
-rwxr-xr-x	select-tail-3-empty-tail	213	log stats plain blame
-rwxr-xr-x	select-tail-4	291	log stats plain blame
-rwxr-xr-x	select-tail-multiple-files	442	log stats plain blame
-rwxr-xr-x	select-tail-multiple-hunks	395	log stats plain blame
-rwxr-xr-x	select-tail-no-conflicts	164	log stats plain blame
-rwxr-xr-x	stdin-dash-operand	358	log stats plain blame
-rwxr-xr-x	stdin-dashdash-dash-operand	361	log stats plain blame
-rwxr-xr-x	stdin-dashdash-no-operand	359	log stats plain blame
-rwxr-xr-x	stdin-no-operand	356	log stats plain blame
-rwxr-xr-x	symmetric-1	154	log stats plain blame
-rwxr-xr-x	symmetric-2-different	202	log stats plain blame
-rwxr-xr-x	symmetric-2-identical	211	log stats plain blame
-rwxr-xr-x	symmetric-3-all-different	229	log stats plain blame
-rwxr-xr-x	symmetric-3-all-identical	236	log stats plain blame
-rwxr-xr-x	symmetric-3-different-base	241	log stats plain blame
-rwxr-xr-x	symmetric-3-different-head	230	log stats plain blame
-rwxr-xr-x	symmetric-3-different-tail	230	log stats plain blame
-rwxr-xr-x	symmetric-3-empty-head	211	log stats plain blame
-rwxr-xr-x	symmetric-3-empty-head-tail	200	log stats plain blame
-rwxr-xr-x	symmetric-3-empty-tail	211	log stats plain blame
-rwxr-xr-x	symmetric-4-different-head	255	log stats plain blame
-rwxr-xr-x	symmetric-4-different-lower-middle	255	log stats plain blame
-rwxr-xr-x	symmetric-4-different-tail	255	log stats plain blame
-rwxr-xr-x	symmetric-4-different-upper-middle	255	log stats plain blame
-rwxr-xr-x	symmetric-4-identical	261	log stats plain blame
-rwxr-xr-x	symmetric-4-same-different-middles	291	log stats plain blame
-rwxr-xr-x	symmetric-4-unique-different-middles	293	log stats plain blame
-rwxr-xr-x	symmetric-5-different-lower-middle	280	log stats plain blame
-rwxr-xr-x	symmetric-5-different-upper-middle	278	log stats plain blame
-rwxr-xr-x	symmetric-multiple-conflicts	598	log stats plain blame
-rwxr-xr-x	symmetric-multiple-files	414	log stats plain blame
-rwxr-xr-x	symmetric-no-conflicts	162	log stats plain blame
-rwxr-xr-x	symmetric-short-option	235	log stats plain blame
-rwxr-xr-x	unclosed-conflict-head	147	log stats plain blame
-rwxr-xr-x	unclosed-conflict-head-parent	173	log stats plain blame
-rwxr-xr-x	unclosed-conflict-head-parent-tail	196	log stats plain blame
-rwxr-xr-x	unclosed-conflict-head-tail	169	log stats plain blame
-rwxr-xr-x	unexpected-separator-end	134	log stats plain blame
-rwxr-xr-x	unexpected-separator-parent	142	log stats plain blame
-rwxr-xr-x	unexpected-separator-tail	135	log stats plain blame