-
由 Ferry Huberts 提交于
In several places merge.keepBackup is used i.s.o. mergetool.keepBackup. This patch makes it all consistent. Signed-off-by: NFerry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>
fb25092a
In several places merge.keepBackup is used i.s.o. mergetool.keepBackup. This patch makes it all consistent. Signed-off-by: NFerry Huberts <ferry.huberts@pelagic.nl> Signed-off-by: NShawn O. Pearce <spearce@spearce.org>