3 Commits

Author	SHA1	Message	Date
Stefan Haller	362678e2ef	Mention which command is continued in PromptToContinueRebase ... When you are in the middle of a rebase, and you cherry-pick a commit which conflicts, it helps to be clear on whether you are prompted to continue the cherry-pick or the rebase.	2025-04-20 15:53:17 +02:00
Stefan Haller	696e78fcc8	Fix ForEachLineInFile to not lose the last line if it doesn't end with a LF	2024-10-09 15:37:08 +02:00
Stefan Haller	b71aa5e23b	Add regression test for resolving conflicts in a file without a trailing LF ... The test shows that the last line of the file is lost.	2024-10-09 15:36:02 +02:00