Tree
- Tree:
c5e1b393b9caf58cf8b1e01c785c5bb8047a361c
- 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 | commits | blame |
parse.y | commits | blame |
template.1 | commits | blame |
template.7 | commits | blame |
template.c | commits | blame |
tmpl.c | commits | blame |
tmpl.h | commits | blame |