Tree
- Tree:
cfe47a5a3c119706032559b01f6afdfd6bc7e1fb
- Date:
- Message:
- allow modified files to be deleted during merges if content exists in the repo This makes histedit folding work when a file is modified by commit A and then deleted in commit B, with A being folded into B. Problem reported by naddy@
Makefile.am | commits | blame |
git-repository.5 | commits | blame |
got-worktree.5 | commits | blame |
got.1 | commits | blame |
got.c | commits | blame |
got.conf.5 | commits | blame |