[GSOC22] - A - Implement a fully functional three way merge UI#8945
Merged
Siedlerchr merged 107 commits intoJabRef:mainfrom HoussemNasri:GSOC-fully-functional-three-way-mergeAug 10, 2022
+1,644-466
Commits
Commits on Mar 24, 2022
- authored
Commits on Mar 31, 2022
Commits on Apr 11, 2022
Commits on Apr 26, 2022
Commits on May 7, 2022
Commits on May 8, 2022
Commits on May 30, 2022
Commits on Jun 7, 2022
Commits on Jun 18, 2022
Commits on Jun 20, 2022
Commits on Jun 23, 2022
Commits on Jul 2, 2022
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- committed
Commits on Jul 3, 2022
Commits on Jul 4, 2022
- committed
- committed
- committed
- committed
- committed
- committed
- committed
- authored
- committed