git.proxmox.com Git - libgit2.git/history - tests/merge/conflict

]> git.proxmox.com Git - libgit2.git/history - tests/merge/conflict_data.h

2022-05-05	Mohammed Bilal	New upstream version 1.4.3+dfsg.1	blob \| commitdiff \| raw
2018-04-26	Pirate Praveen	New upstream version 0.27.0+dfsg.1	blob \| commitdiff \| raw \| diff to current
2016-04-03	Andreas Henriksson	Imported Upstream version 0.24.0	blob \| commitdiff \| raw \| diff to current
2015-12-01	Edward Thomson	Merge pull request #3508 from libgit2/cmn/tree-parse...	blob \| commitdiff \| raw \| diff to current
2015-11-30	Carlos Martín Nieto	Merge pull request #3513 from ethomson/merge_recursive	blob \| commitdiff \| raw \| diff to current
2015-11-25	Edward Thomson	merge: handle conflicts in recursive base building	blob \| commitdiff \| raw \| diff to current
2015-11-25	Edward Thomson	recursive: test conflict output during recursive merge	blob \| commitdiff \| raw \| diff to current
2015-11-25	Edward Thomson	merge tests: move expected data into own file	blob \| commitdiff \| raw \| diff to current

The git library used in some Proxmox tool chains