2 Commits

Author	SHA1	Message	Date
thecodrr	041ab52cfa	fix: crash when resolving conflicts	2021-05-31 10:34:50 +05:00
thecodrr	bf5429d1f7	feat: improve html diff viewer ... performance increased by 40% diffing is now offloaded to a worker thread next & previous conflict buttons added made diff viewing read only	2021-05-28 21:27:59 +05:00