Code

Make difftool.prompt fall back to mergetool.prompt
[git.git] / builtin-merge-index.c
2010-01-22 Linus Torvaldsmake "merge-index" a built-in