720d150c48
I really wanted to try this out, instead of asking for an adjustment to the 'git merge' driver and waiting. For now the new strategy is called 'fredrik' and not in the list of default strategies to be tried. The script wants Python 2.4 so this commit also adjusts Debian and RPM build procecure files. Signed-off-by: Junio C Hamano <junkio@cox.net> |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| changelog | ||
| compat | ||
| control | ||
| copyright | ||
| docs | ||
| git-core.doc-base | ||
| git-core.files | ||
| git-tk.files | ||
| rules | ||