Merge branch 'cb/merge-recursive-fix'

diff --git a/git.spec.in b/git.spec.in
index 6733b6f5551e43835fcf46793142d9d7ffbe27f9..069ace050d2eec5a6f5f805d59f0208da01fdf1b 100644 (file)
--- a/git.spec.in
+++ b/git.spec.in
@@ -168,6 +168,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %{_libexecdir}/git-core/git-gui
 %{_libexecdir}/git-core/git-citool
+%{_libexecdir}/git-core/git-gui--askpass
 %{_datadir}/git-gui/
 %{!?_without_docs: %{_mandir}/man1/git-gui.1*}
 %{!?_without_docs: %doc Documentation/git-gui.html}