mirror of
https://github.com/git/git.git
synced 2024-11-05 00:37:55 +01:00
Mirror of https://github.com/git/git
fb25092a88
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-gui--askpass | ||
git-gui.sh | ||
GIT-VERSION-GEN | ||
Makefile |