Skip to content

Commit

Permalink
Supress warning
Browse files Browse the repository at this point in the history
  • Loading branch information
@benedikt-schesch
benedikt-schesch committed Aug 8, 2023
1 parent 808d1ce commit 2d34a89
Show file tree
Hide file tree
Showing 542 changed files with 707 additions and 7,514 deletions.
7,442 changes: 4 additions & 7,438 deletions results/filtered_result.csv
View file

Large diffs are not rendered by default.

Binary file modified results/plots/all/cost_with_manual.pdf
View file
Binary file not shown.
Binary file modified results/plots/all/cost_without_manual.pdf
View file
Binary file not shown.
Binary file modified results/plots/all/heatmap.pdf
View file
Binary file not shown.
13 changes: 13 additions & 0 deletions results/plots/all/heatmap.pgf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2541,6 +2541,19 @@
\pgfusepath{fill}%
\end{pgfscope}%
\begin{pgfscope}%
\pgfpathrectangle{\pgfqpoint{5.618710in}{1.603194in}}{\pgfqpoint{0.152340in}{3.046806in}}%
\pgfusepath{clip}%
\pgfsetbuttcap%
\pgfsetmiterjoin%
\definecolor{currentfill}{rgb}{1.000000,1.000000,1.000000}%
\pgfsetfillcolor{currentfill}%
\pgfsetlinewidth{0.010037pt}%
\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}%
\pgfsetstrokecolor{currentstroke}%
\pgfsetdash{}{0pt}%
\pgfusepath{stroke,fill}%
\end{pgfscope}%
\begin{pgfscope}%
\pgfsys@transformshift{5.620000in}{1.600000in}%
\pgftext[left,bottom]{\includegraphics[interpolate=true,width=0.150000in,height=3.050000in]{plots/all/heatmap-img0.png}}%
\end{pgfscope}%
Expand Down
Binary file modified results/plots/git/cost_with_manual.pdf
View file
Binary file not shown.
Binary file modified results/plots/git/cost_without_manual.pdf
View file
Binary file not shown.
Binary file modified results/plots/git/heatmap.pdf
View file
Binary file not shown.
13 changes: 13 additions & 0 deletions results/plots/git/heatmap.pgf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1383,6 +1383,19 @@
\pgfusepath{fill}%
\end{pgfscope}%
\begin{pgfscope}%
\pgfpathrectangle{\pgfqpoint{5.618710in}{1.603194in}}{\pgfqpoint{0.152340in}{3.046806in}}%
\pgfusepath{clip}%
\pgfsetbuttcap%
\pgfsetmiterjoin%
\definecolor{currentfill}{rgb}{1.000000,1.000000,1.000000}%
\pgfsetfillcolor{currentfill}%
\pgfsetlinewidth{0.010037pt}%
\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}%
\pgfsetstrokecolor{currentstroke}%
\pgfsetdash{}{0pt}%
\pgfusepath{stroke,fill}%
\end{pgfscope}%
\begin{pgfscope}%
\pgfsys@transformshift{5.620000in}{1.600000in}%
\pgftext[left,bottom]{\includegraphics[interpolate=true,width=0.150000in,height=3.050000in]{plots/git/heatmap-img0.png}}%
\end{pgfscope}%
Expand Down
Binary file modified results/plots/tools/cost_with_manual.pdf
View file
Binary file not shown.
Binary file modified results/plots/tools/cost_without_manual.pdf
View file
Binary file not shown.
Binary file modified results/plots/tools/heatmap.pdf
View file
Binary file not shown.
13 changes: 13 additions & 0 deletions results/plots/tools/heatmap.pgf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,19 @@
\pgfusepath{fill}%
\end{pgfscope}%
\begin{pgfscope}%
\pgfpathrectangle{\pgfqpoint{5.579184in}{1.416869in}}{\pgfqpoint{0.161657in}{3.233131in}}%
\pgfusepath{clip}%
\pgfsetbuttcap%
\pgfsetmiterjoin%
\definecolor{currentfill}{rgb}{1.000000,1.000000,1.000000}%
\pgfsetfillcolor{currentfill}%
\pgfsetlinewidth{0.010037pt}%
\definecolor{currentstroke}{rgb}{1.000000,1.000000,1.000000}%
\pgfsetstrokecolor{currentstroke}%
\pgfsetdash{}{0pt}%
\pgfusepath{stroke,fill}%
\end{pgfscope}%
\begin{pgfscope}%
\pgfsys@transformshift{5.580000in}{1.420000in}%
\pgftext[left,bottom]{\includegraphics[interpolate=true,width=0.160000in,height=3.230000in]{plots/tools/heatmap-img0.png}}%
\end{pgfscope}%
Expand Down
20 changes: 10 additions & 10 deletions results/tables/all/table_feature_main_summary.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
\multicolumn{2}{c}{Feature Branch} \\
\hline
& \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\
Gitmerge-ort & 6005 & 93\% & 835 & 87\% & 431 & 7\% & 105 & 11\% & 47 & 1\% & 15 & 2\% \\
Gitmerge-ort-ignorespace & 6017 & 93\% & 839 & 88\% & 417 & 6\% & 103 & 11\% & 49 & 1\% & 13 & 1\% \\
Gitmerge-recursive-patience & 5990 & 92\% & 837 & 88\% & 430 & 7\% & 105 & 11\% & 63 & 1\% & 13 & 1\% \\
Gitmerge-recursive-minimal & 5993 & 92\% & 839 & 88\% & 431 & 7\% & 105 & 11\% & 59 & 1\% & 11 & 1\% \\
Gitmerge-recursive-histogram & 5994 & 92\% & 840 & 88\% & 432 & 7\% & 105 & 11\% & 57 & 1\% & 10 & 1\% \\
Gitmerge-recursive-myers & 5998 & 93\% & 839 & 88\% & 431 & 7\% & 105 & 11\% & 54 & 1\% & 11 & 1\% \\
Gitmerge-resolve & 5990 & 92\% & 839 & 88\% & 440 & 7\% & 104 & 11\% & 53 & 1\% & 12 & 1\% \\
Git-hires-merge & 5978 & 92\% & 835 & 87\% & 451 & 7\% & 105 & 11\% & 54 & 1\% & 15 & 2\% \\
Spork & 6086 & 94\% & 851 & 89\% & 324 & 5\% & 87 & 9\% & 73 & 1\% & 17 & 2\% \\
IntelliMerge & 6004 & 93\% & 836 & 88\% & 431 & 7\% & 104 & 11\% & 48 & 1\% & 15 & 2\% \\
Gitmerge-ort & 6005 & 93\% & 835 & 87\% & 431 & 7\% & 105 & 11\% & 47 & 1\% & 15 & 2\% \\
Gitmerge-ort-ignorespace & 6017 & 93\% & 839 & 88\% & 417 & 6\% & 103 & 11\% & 49 & 1\% & 13 & 1\% \\
Gitmerge-recursive-patience & 5990 & 92\% & 837 & 88\% & 430 & 7\% & 105 & 11\% & 63 & 1\% & 13 & 1\% \\
Gitmerge-recursive-minimal & 5993 & 92\% & 839 & 88\% & 431 & 7\% & 105 & 11\% & 59 & 1\% & 11 & 1\% \\
Gitmerge-recursive-histogram & 5994 & 92\% & 840 & 88\% & 432 & 7\% & 105 & 11\% & 57 & 1\% & 10 & 1\% \\
Gitmerge-recursive-myers & 5998 & 93\% & 839 & 88\% & 431 & 7\% & 105 & 11\% & 54 & 1\% & 11 & 1\% \\
Gitmerge-resolve & 5990 & 92\% & 839 & 88\% & 440 & 7\% & 104 & 11\% & 53 & 1\% & 12 & 1\% \\
Git-hires-merge & 5978 & 92\% & 835 & 87\% & 451 & 7\% & 105 & 11\% & 54 & 1\% & 15 & 2\% \\
Spork & 6086 & 94\% & 851 & 89\% & 324 & 5\% & 87 & 9\% & 73 & 1\% & 17 & 2\% \\
IntelliMerge & 6004 & 93\% & 836 & 88\% & 431 & 7\% & 104 & 11\% & 48 & 1\% & 15 & 2\% \\
\end{tabular}
20 changes: 10 additions & 10 deletions results/tables/all/table_run_time.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
& \multicolumn{3}{c}{Run time (seconds)} \\
Tool & Mean & Median & Max \\
\hline
Gitmerge-ort & 0.09 & 0.07 & 0.22 \\
Gitmerge-ort-ignorespace & 0.09 & 0.07 & 0.22 \\
Gitmerge-recursive-patience & 0.09 & 0.08 & 0.22 \\
Gitmerge-recursive-minimal & 0.09 & 0.08 & 0.22 \\
Gitmerge-recursive-histogram & 0.09 & 0.08 & 0.22 \\
Gitmerge-recursive-myers & 0.09 & 0.08 & 0.22 \\
Gitmerge-resolve & 0.11 & 0.08 & 0.45 \\
Git-hires-merge & 0.06 & 0.04 & 0.18 \\
Spork & 0.12 & 0.10 & 0.34 \\
Intellimerge & 1.53 & 1.44 & 3.11 \\
Gitmerge-ort & 0.09 & 0.07 & 0.22 \\
Gitmerge-ort-ignorespace & 0.09 & 0.07 & 0.22 \\
Gitmerge-recursive-patience & 0.09 & 0.08 & 0.22 \\
Gitmerge-recursive-minimal & 0.09 & 0.08 & 0.22 \\
Gitmerge-recursive-histogram & 0.09 & 0.08 & 0.22 \\
Gitmerge-recursive-myers & 0.09 & 0.08 & 0.22 \\
Gitmerge-resolve & 0.11 & 0.08 & 0.45 \\
Git-hires-merge & 0.06 & 0.04 & 0.18 \\
Spork & 0.12 & 0.10 & 0.34 \\
Intellimerge & 1.53 & 1.44 & 3.11 \\
\end{tabular}
20 changes: 10 additions & 10 deletions results/tables/all/table_summary.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@
\multicolumn{2}{c}{Incorrect Merges} \\
& \# & \% & \# & \% & \# & \% \\
\hline
Gitmerge-ort & 6840 & 92\% & 536 & 7\% & 62 & 1\% \\
Gitmerge-ort-ignorespace & 6856 & 92\% & 520 & 7\% & 62 & 1\% \\
Gitmerge-recursive-patience & 6827 & 92\% & 535 & 7\% & 76 & 1\% \\
Gitmerge-recursive-minimal & 6832 & 92\% & 536 & 7\% & 70 & 1\% \\
Gitmerge-recursive-histogram & 6834 & 92\% & 537 & 7\% & 67 & 1\% \\
Gitmerge-recursive-myers & 6837 & 92\% & 536 & 7\% & 65 & 1\% \\
Gitmerge-resolve & 6829 & 92\% & 544 & 7\% & 65 & 1\% \\
Git-hires-merge & 6813 & 92\% & 556 & 7\% & 69 & 1\% \\
Spork & 6937 & 93\% & 411 & 6\% & 90 & 1\% \\
IntelliMerge & 6840 & 92\% & 535 & 7\% & 63 & 1\% \\
Gitmerge-ort & 6840 & 92\% & 536 & 7\% & 62 & 1\% \\
Gitmerge-ort-ignorespace & 6856 & 92\% & 520 & 7\% & 62 & 1\% \\
Gitmerge-recursive-patience & 6827 & 92\% & 535 & 7\% & 76 & 1\% \\
Gitmerge-recursive-minimal & 6832 & 92\% & 536 & 7\% & 70 & 1\% \\
Gitmerge-recursive-histogram & 6834 & 92\% & 537 & 7\% & 67 & 1\% \\
Gitmerge-recursive-myers & 6837 & 92\% & 536 & 7\% & 65 & 1\% \\
Gitmerge-resolve & 6829 & 92\% & 544 & 7\% & 65 & 1\% \\
Git-hires-merge & 6813 & 92\% & 556 & 7\% & 69 & 1\% \\
Spork & 6937 & 93\% & 411 & 6\% & 90 & 1\% \\
IntelliMerge & 6840 & 92\% & 535 & 7\% & 63 & 1\% \\
\end{tabular}
14 changes: 7 additions & 7 deletions results/tables/git/table_feature_main_summary.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
\multicolumn{2}{c}{Feature Branch} \\
\hline
& \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\
Gitmerge-ort & 6005 & 93\% & 835 & 87\% & 431 & 7\% & 105 & 11\% & 47 & 1\% & 15 & 2\% \\
Gitmerge-ort-ignorespace & 6017 & 93\% & 839 & 88\% & 417 & 6\% & 103 & 11\% & 49 & 1\% & 13 & 1\% \\
Gitmerge-recursive-patience & 5990 & 92\% & 837 & 88\% & 430 & 7\% & 105 & 11\% & 63 & 1\% & 13 & 1\% \\
Gitmerge-recursive-minimal & 5993 & 92\% & 839 & 88\% & 431 & 7\% & 105 & 11\% & 59 & 1\% & 11 & 1\% \\
Gitmerge-recursive-histogram & 5994 & 92\% & 840 & 88\% & 432 & 7\% & 105 & 11\% & 57 & 1\% & 10 & 1\% \\
Gitmerge-recursive-myers & 5998 & 93\% & 839 & 88\% & 431 & 7\% & 105 & 11\% & 54 & 1\% & 11 & 1\% \\
Gitmerge-resolve & 5990 & 92\% & 839 & 88\% & 440 & 7\% & 104 & 11\% & 53 & 1\% & 12 & 1\% \\
Gitmerge-ort & 6005 & 93\% & 835 & 87\% & 431 & 7\% & 105 & 11\% & 47 & 1\% & 15 & 2\% \\
Gitmerge-ort-ignorespace & 6017 & 93\% & 839 & 88\% & 417 & 6\% & 103 & 11\% & 49 & 1\% & 13 & 1\% \\
Gitmerge-recursive-patience & 5990 & 92\% & 837 & 88\% & 430 & 7\% & 105 & 11\% & 63 & 1\% & 13 & 1\% \\
Gitmerge-recursive-minimal & 5993 & 92\% & 839 & 88\% & 431 & 7\% & 105 & 11\% & 59 & 1\% & 11 & 1\% \\
Gitmerge-recursive-histogram & 5994 & 92\% & 840 & 88\% & 432 & 7\% & 105 & 11\% & 57 & 1\% & 10 & 1\% \\
Gitmerge-recursive-myers & 5998 & 93\% & 839 & 88\% & 431 & 7\% & 105 & 11\% & 54 & 1\% & 11 & 1\% \\
Gitmerge-resolve & 5990 & 92\% & 839 & 88\% & 440 & 7\% & 104 & 11\% & 53 & 1\% & 12 & 1\% \\
\end{tabular}
14 changes: 7 additions & 7 deletions results/tables/git/table_run_time.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@
& \multicolumn{3}{c}{Run time (seconds)} \\
Tool & Mean & Median & Max \\
\hline
Gitmerge-ort & 0.09 & 0.07 & 0.22 \\
Gitmerge-ort-ignorespace & 0.09 & 0.07 & 0.22 \\
Gitmerge-recursive-patience & 0.09 & 0.08 & 0.22 \\
Gitmerge-recursive-minimal & 0.09 & 0.08 & 0.22 \\
Gitmerge-recursive-histogram & 0.09 & 0.08 & 0.22 \\
Gitmerge-recursive-myers & 0.09 & 0.08 & 0.22 \\
Gitmerge-resolve & 0.11 & 0.08 & 0.45 \\
Gitmerge-ort & 0.09 & 0.07 & 0.22 \\
Gitmerge-ort-ignorespace & 0.09 & 0.07 & 0.22 \\
Gitmerge-recursive-patience & 0.09 & 0.08 & 0.22 \\
Gitmerge-recursive-minimal & 0.09 & 0.08 & 0.22 \\
Gitmerge-recursive-histogram & 0.09 & 0.08 & 0.22 \\
Gitmerge-recursive-myers & 0.09 & 0.08 & 0.22 \\
Gitmerge-resolve & 0.11 & 0.08 & 0.45 \\
\end{tabular}
14 changes: 7 additions & 7 deletions results/tables/git/table_summary.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
\multicolumn{2}{c}{Incorrect Merges} \\
& \# & \% & \# & \% & \# & \% \\
\hline
Gitmerge-ort & 6840 & 92\% & 536 & 7\% & 62 & 1\% \\
Gitmerge-ort-ignorespace & 6856 & 92\% & 520 & 7\% & 62 & 1\% \\
Gitmerge-recursive-patience & 6827 & 92\% & 535 & 7\% & 76 & 1\% \\
Gitmerge-recursive-minimal & 6832 & 92\% & 536 & 7\% & 70 & 1\% \\
Gitmerge-recursive-histogram & 6834 & 92\% & 537 & 7\% & 67 & 1\% \\
Gitmerge-recursive-myers & 6837 & 92\% & 536 & 7\% & 65 & 1\% \\
Gitmerge-resolve & 6829 & 92\% & 544 & 7\% & 65 & 1\% \\
Gitmerge-ort & 6840 & 92\% & 536 & 7\% & 62 & 1\% \\
Gitmerge-ort-ignorespace & 6856 & 92\% & 520 & 7\% & 62 & 1\% \\
Gitmerge-recursive-patience & 6827 & 92\% & 535 & 7\% & 76 & 1\% \\
Gitmerge-recursive-minimal & 6832 & 92\% & 536 & 7\% & 70 & 1\% \\
Gitmerge-recursive-histogram & 6834 & 92\% & 537 & 7\% & 67 & 1\% \\
Gitmerge-recursive-myers & 6837 & 92\% & 536 & 7\% & 65 & 1\% \\
Gitmerge-resolve & 6829 & 92\% & 544 & 7\% & 65 & 1\% \\
\end{tabular}
10 changes: 5 additions & 5 deletions results/tables/tools/table_feature_main_summary.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
\multicolumn{2}{c}{Feature Branch} \\
\hline
& \# & \% & \# & \% & \# & \% & \# & \% & \# & \% & \# & \% \\
Gitmerge-ort & 6005 & 93\% & 835 & 87\% & 431 & 7\% & 105 & 11\% & 47 & 1\% & 15 & 2\% \\
Gitmerge-ort-ignorespace & 6017 & 93\% & 839 & 88\% & 417 & 6\% & 103 & 11\% & 49 & 1\% & 13 & 1\% \\
Git-hires-merge & 5978 & 92\% & 835 & 87\% & 451 & 7\% & 105 & 11\% & 54 & 1\% & 15 & 2\% \\
Spork & 6086 & 94\% & 851 & 89\% & 324 & 5\% & 87 & 9\% & 73 & 1\% & 17 & 2\% \\
IntelliMerge & 6004 & 93\% & 836 & 88\% & 431 & 7\% & 104 & 11\% & 48 & 1\% & 15 & 2\% \\
Gitmerge-ort & 6005 & 93\% & 835 & 87\% & 431 & 7\% & 105 & 11\% & 47 & 1\% & 15 & 2\% \\
Gitmerge-ort-ignorespace & 6017 & 93\% & 839 & 88\% & 417 & 6\% & 103 & 11\% & 49 & 1\% & 13 & 1\% \\
Git-hires-merge & 5978 & 92\% & 835 & 87\% & 451 & 7\% & 105 & 11\% & 54 & 1\% & 15 & 2\% \\
Spork & 6086 & 94\% & 851 & 89\% & 324 & 5\% & 87 & 9\% & 73 & 1\% & 17 & 2\% \\
IntelliMerge & 6004 & 93\% & 836 & 88\% & 431 & 7\% & 104 & 11\% & 48 & 1\% & 15 & 2\% \\
\end{tabular}
10 changes: 5 additions & 5 deletions results/tables/tools/table_run_time.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
& \multicolumn{3}{c}{Run time (seconds)} \\
Tool & Mean & Median & Max \\
\hline
Gitmerge-ort & 0.09 & 0.07 & 0.22 \\
Gitmerge-ort-ignorespace & 0.09 & 0.07 & 0.22 \\
Git-hires-merge & 0.06 & 0.04 & 0.18 \\
Spork & 0.12 & 0.10 & 0.34 \\
Intellimerge & 1.53 & 1.44 & 3.11 \\
Gitmerge-ort & 0.09 & 0.07 & 0.22 \\
Gitmerge-ort-ignorespace & 0.09 & 0.07 & 0.22 \\
Git-hires-merge & 0.06 & 0.04 & 0.18 \\
Spork & 0.12 & 0.10 & 0.34 \\
Intellimerge & 1.53 & 1.44 & 3.11 \\
\end{tabular}
10 changes: 5 additions & 5 deletions results/tables/tools/table_summary.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,9 @@
\multicolumn{2}{c}{Incorrect Merges} \\
& \# & \% & \# & \% & \# & \% \\
\hline
Gitmerge-ort & 6840 & 92\% & 536 & 7\% & 62 & 1\% \\
Gitmerge-ort-ignorespace & 6856 & 92\% & 520 & 7\% & 62 & 1\% \\
Git-hires-merge & 6813 & 92\% & 556 & 7\% & 69 & 1\% \\
Spork & 6937 & 93\% & 411 & 6\% & 90 & 1\% \\
IntelliMerge & 6840 & 92\% & 535 & 7\% & 63 & 1\% \\
Gitmerge-ort & 6840 & 92\% & 536 & 7\% & 62 & 1\% \\
Gitmerge-ort-ignorespace & 6856 & 92\% & 520 & 7\% & 62 & 1\% \\
Git-hires-merge & 6813 & 92\% & 556 & 7\% & 69 & 1\% \\
Spork & 6937 & 93\% & 411 & 6\% & 90 & 1\% \\
IntelliMerge & 6840 & 92\% & 535 & 7\% & 63 & 1\% \\
\end{tabular}
23 changes: 13 additions & 10 deletions src/python/latex_output.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import os
import argparse
from pathlib import Path
import warnings

import numpy as np
import matplotlib.pyplot as plt
Expand Down Expand Up @@ -240,16 +241,18 @@ def compute_inconsistent_merge_results(df: pd.DataFrame):
latex_merge_tool = [
"\\mbox{" + merge_tool_latex_name(i) + "}" for i in merge_tools
]
heatmap = sns.heatmap(
result,
annot=True,
ax=ax,
xticklabels=latex_merge_tool,
yticklabels=latex_merge_tool,
fmt="g",
mask=result == 0,
cmap="Blues",
)
with warnings.catch_warnings():
warnings.simplefilter("ignore")
heatmap = sns.heatmap(
result,
annot=True,
ax=ax,
xticklabels=latex_merge_tool,
yticklabels=latex_merge_tool,
fmt="g",
mask=result == 0,
cmap="Blues",
)
heatmap.set_yticklabels(labels=heatmap.get_yticklabels(), va="center")
heatmap.set_xticklabels(
labels=heatmap.get_xticklabels(),
Expand Down
1 change: 1 addition & 0 deletions ...ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-ort-ignorespace_git-hires-merge.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...61ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-ort-ignorespace_gitmerge-meld.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-ort-ignorespace_gitmerge-ort.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...b5b6e3378461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-ort_git-hires-merge.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...e9b5b6e3378461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-ort_gitmerge-meld.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-histogram_git-hires-merge.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-histogram_gitmerge-meld.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...6d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-histogram_gitmerge-ort-ignorespace.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...e4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-histogram_gitmerge-ort.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-minimal_git-hires-merge.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-minimal_gitmerge-meld.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-minimal_gitmerge-ort-ignorespace.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...1ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-minimal_gitmerge-ort.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-minimal_gitmerge-recursive-histogram.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-myers_git-hires-merge.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...61ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-myers_gitmerge-meld.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...e7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-myers_gitmerge-ort-ignorespace.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-myers_gitmerge-ort.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...6d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-myers_gitmerge-recursive-histogram.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-myers_gitmerge-recursive-minimal.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ..._e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-patience_git-hires-merge.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...e4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-patience_gitmerge-meld.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...16d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-patience_gitmerge-ort-ignorespace.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-patience_gitmerge-ort.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-patience_gitmerge-recursive-histogram.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-patience_gitmerge-recursive-minimal.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...16d6b763f7d32f72f54edd735b5ea6bc_gitmerge-recursive-patience_gitmerge-recursive-myers.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...e3378461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-resolve_git-hires-merge.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...b6e3378461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-resolve_gitmerge-meld.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...e4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-resolve_gitmerge-ort-ignorespace.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...5b6e3378461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-resolve_gitmerge-ort.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-resolve_gitmerge-recursive-histogram.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ..._e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-resolve_gitmerge-recursive-minimal.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...e4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-resolve_gitmerge-recursive-myers.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...e866ae7916d6b763f7d32f72f54edd735b5ea6bc_gitmerge-resolve_gitmerge-recursive-patience.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...b5b6e3378461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_intellimerge_git-hires-merge.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...e9b5b6e3378461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_intellimerge_gitmerge-meld.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_intellimerge_gitmerge-ort-ignorespace.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...8e9b5b6e3378461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_intellimerge_gitmerge-ort.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...e4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_intellimerge_gitmerge-recursive-histogram.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...1ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_intellimerge_gitmerge-recursive-minimal.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
1 change: 1 addition & 0 deletions ...461ce4_e866ae7916d6b763f7d32f72f54edd735b5ea6bc_intellimerge_gitmerge-recursive-myers.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
True
Loading

0 comments on commit 2d34a89

Please sign in to comment.