diff options
Diffstat (limited to 'tests/resources/merge-whitespace/.gitted/refs')
5 files changed, 5 insertions, 0 deletions
diff --git a/tests/resources/merge-whitespace/.gitted/refs/heads/branch_a_change b/tests/resources/merge-whitespace/.gitted/refs/heads/branch_a_change new file mode 100644 index 0000000..3a46eff --- /dev/null +++ b/tests/resources/merge-whitespace/.gitted/refs/heads/branch_a_change @@ -0,0 +1 @@ +d95182053c31f8aa09df4fa225f4e668c5320b59 diff --git a/tests/resources/merge-whitespace/.gitted/refs/heads/branch_a_eol b/tests/resources/merge-whitespace/.gitted/refs/heads/branch_a_eol new file mode 100644 index 0000000..a59d5b5 --- /dev/null +++ b/tests/resources/merge-whitespace/.gitted/refs/heads/branch_a_eol @@ -0,0 +1 @@ +9c5362069759fb37ae036cef6e4b2f95c6c5eaab diff --git a/tests/resources/merge-whitespace/.gitted/refs/heads/branch_b_change b/tests/resources/merge-whitespace/.gitted/refs/heads/branch_b_change new file mode 100644 index 0000000..c14ced3 --- /dev/null +++ b/tests/resources/merge-whitespace/.gitted/refs/heads/branch_b_change @@ -0,0 +1 @@ +b2a69114f4897109fedf1aafea363cb2d2557029 diff --git a/tests/resources/merge-whitespace/.gitted/refs/heads/branch_b_eol b/tests/resources/merge-whitespace/.gitted/refs/heads/branch_b_eol new file mode 100644 index 0000000..9e25c6e --- /dev/null +++ b/tests/resources/merge-whitespace/.gitted/refs/heads/branch_b_eol @@ -0,0 +1 @@ +bfe4ea5805af22a5b194259bda6f5f634486f891 diff --git a/tests/resources/merge-whitespace/.gitted/refs/heads/master b/tests/resources/merge-whitespace/.gitted/refs/heads/master new file mode 100644 index 0000000..61e8ae7 --- /dev/null +++ b/tests/resources/merge-whitespace/.gitted/refs/heads/master @@ -0,0 +1 @@ +1189e10a62aadf2fea8cd018afb52c1980f40b4f |