Ilya Grigoriev fcd02a6091 merge_tools.toml: add VS Code as a default merge tool. ... Thanks to @glencbz for noticing that VS Code works fine now as a merge tool, and thanks to @solson for suggesting `merge-tool-edits-conflict-markers = true`.		2023-10-25 12:47:51 -07:00
..
examples	workspace: make working-copy type customizable	2023-10-16 22:33:44 -07:00
src	merge_tools.toml: add VS Code as a default merge tool.	2023-10-25 12:47:51 -07:00
testing	fake_diff_editor: Allow specifying extra arguments to be ignored	2023-08-21 20:19:15 -07:00
tests	cli templates: include hidden (AKA abandoned) status in short commit template	2023-10-24 12:37:26 -07:00
build.rs	build: update rerun-if conditions to watch .git/HEAD in colocated repo	2023-08-06 12:16:11 +09:00
Cargo.toml	cli: use StringPattern to find branches to delete/forget	2023-10-22 04:07:49 +09:00
LICENSE	cargo: add LICENSE file to each crate we publish	2023-09-22 21:48:28 -07:00