6 commits

Author	SHA1	Message	Date
Stefan Haller	90b8fd242d	Add config git.autoStageResolvedConflicts	2024-09-02 18:12:47 +02:00
Jesse Duffield	63dc07fded	Construct arg vector manually rather than parse string ... By constructing an arg vector manually, we no longer need to quote arguments Mandate that args must be passed when building a command Now you need to provide an args array when building a command. There are a handful of places where we need to deal with a string, such as with user-defined custom commands, and for those we now require that at the callsite they use str.ToArgv to do that. I don't want to provide a method out of the box for it because I want to discourage its use. For some reason we were invoking a command through a shell when amending a commit, and I don't believe we needed to do that as there was nothing user- supplied about the command. So I've switched to using a regular command out- side the shell there	2023-05-23 19:49:19 +10:00
Jesse Duffield	7f5465a27b	fix flaky tests	2023-04-14 21:01:45 +10:00
Jesse Duffield	f7e8b2dd71	cleanup integration test code	2023-02-26 12:54:13 +11:00
Jesse Duffield	ff3c5d331e	migrate merge conflict tests	2023-02-26 11:22:24 +11:00
Jesse Duffield	93b9e1bd19	migrate merge conflict undo test	2023-02-19 15:48:09 +11:00