summaryrefslogtreecommitdiffstats
path: root/docs/merge-df_conflicts.txt
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 12:47:06 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-04 12:47:06 +0000
commitd734310cc7ed3f5d53661b04723093db21a87f36 (patch)
tree4b825dc642cb6eb9a060e54bf8d69288fbee4904 /docs/merge-df_conflicts.txt
downloadlibgit2-d734310cc7ed3f5d53661b04723093db21a87f36.tar.xz
libgit2-d734310cc7ed3f5d53661b04723093db21a87f36.zip
Initial commit.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'docs/merge-df_conflicts.txt')
0 files changed, 0 insertions, 0 deletions