Ferry Huberts <ferry.huberts@xxxxxxxxxx> wrote: > 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@xxxxxxxxxx> > --- > This patch is rebased on v1.6.2.2 > > contrib/difftool/git-difftool.txt | 2 +- > git-gui/git-gui.sh | 2 +- > git-gui/lib/mergetool.tcl | 2 +- > git-mergetool.sh | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) git-gui patches should be sent by themselves as they apply to git-gui.git which is then merged into git.git every so often. Yesterday I broke the git-gui part out by hand and applied it to git-gui.git. You should break this patch down and send Junio the non-git-gui half so he can more easily apply it to git.git. -- Shawn. -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html