Dan Davison 6745f42dda Display merge conflicts		2021-12-05 11:25:05 -05:00
..
assets	Update syntaxes and themes from bat v0.18.3	2021-10-26 13:27:31 -04:00
bin	Update diagnostics script	2021-09-30 18:45:15 -04:00
ci	delete travis ci (#418)	2020-12-03 16:19:09 -05:00
completion	Fix bash completion to include local files/dirs (#540)	2021-03-15 09:50:41 -05:00
docker	Compile delta from source in dockerfile	2021-08-20 10:19:55 -07:00
examples	Display merge conflicts	2021-12-05 11:25:05 -05:00
performance	Reorganize	2020-08-05 16:37:09 -04:00
release.Makefile	Don't build and test in release Make target	2021-11-27 08:39:08 -05:00