libgit2/tests-clar/resources/merge-resolve/.gitted/refs/heads
Edward Thomson bec65a5e99 merge!
2013-04-30 15:31:31 -05:00
..
branch merge! 2013-04-30 15:31:31 -05:00
df_ancestor merge! 2013-04-30 15:31:31 -05:00
df_side1 merge! 2013-04-30 15:31:31 -05:00
df_side2 merge! 2013-04-30 15:31:31 -05:00
ff_branch merge! 2013-04-30 15:31:31 -05:00
master merge! 2013-04-30 15:31:31 -05:00
octo1 merge! 2013-04-30 15:31:31 -05:00
octo2 merge! 2013-04-30 15:31:31 -05:00
octo3 merge! 2013-04-30 15:31:31 -05:00
octo4 merge! 2013-04-30 15:31:31 -05:00
octo5 merge! 2013-04-30 15:31:31 -05:00
octo6 merge! 2013-04-30 15:31:31 -05:00
rename_conflict_ancestor merge! 2013-04-30 15:31:31 -05:00
rename_conflict_ours merge! 2013-04-30 15:31:31 -05:00
rename_conflict_theirs merge! 2013-04-30 15:31:31 -05:00
renames1 merge! 2013-04-30 15:31:31 -05:00
renames2 merge! 2013-04-30 15:31:31 -05:00
trivial-2alt merge! 2013-04-30 15:31:31 -05:00
trivial-2alt-branch merge! 2013-04-30 15:31:31 -05:00
trivial-3alt merge! 2013-04-30 15:31:31 -05:00
trivial-3alt-branch merge! 2013-04-30 15:31:31 -05:00
trivial-4 merge! 2013-04-30 15:31:31 -05:00
trivial-4-branch merge! 2013-04-30 15:31:31 -05:00
trivial-5alt-1 merge! 2013-04-30 15:31:31 -05:00
trivial-5alt-1-branch merge! 2013-04-30 15:31:31 -05:00
trivial-5alt-2 merge! 2013-04-30 15:31:31 -05:00
trivial-5alt-2-branch merge! 2013-04-30 15:31:31 -05:00
trivial-6 merge! 2013-04-30 15:31:31 -05:00
trivial-6-branch merge! 2013-04-30 15:31:31 -05:00
trivial-7 merge! 2013-04-30 15:31:31 -05:00
trivial-7-branch merge! 2013-04-30 15:31:31 -05:00
trivial-8 merge! 2013-04-30 15:31:31 -05:00
trivial-8-branch merge! 2013-04-30 15:31:31 -05:00
trivial-9 merge! 2013-04-30 15:31:31 -05:00
trivial-9-branch merge! 2013-04-30 15:31:31 -05:00
trivial-10 merge! 2013-04-30 15:31:31 -05:00
trivial-10-branch merge! 2013-04-30 15:31:31 -05:00
trivial-11 merge! 2013-04-30 15:31:31 -05:00
trivial-11-branch merge! 2013-04-30 15:31:31 -05:00
trivial-13 merge! 2013-04-30 15:31:31 -05:00
trivial-13-branch merge! 2013-04-30 15:31:31 -05:00
trivial-14 merge! 2013-04-30 15:31:31 -05:00
trivial-14-branch merge! 2013-04-30 15:31:31 -05:00
unrelated merge! 2013-04-30 15:31:31 -05:00