In several places merge.keepBackup is used i.s.o. mergetool.keepBackup. This patch makes it all consistent. Signed-off-by: Ferry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: Shawn O. Pearce <spearce@spearce.org> |
||
|---|---|---|
| lib | ||
| macosx | ||
| po | ||
| windows | ||
| .gitattributes | ||
| .gitignore | ||
| GIT-VERSION-GEN | ||
| Makefile | ||
| git-gui--askpass | ||
| git-gui.sh | ||