mirror of
https://github.com/mhagger/git-imerge.git
synced 2024-09-11 15:16:16 +03:00
It is no longer needed outside this directory since it has mostly been replaced by setup.py. Always build the talk HTML, now that the Makefile is in a subdir, since subdir builds only happen when explicitly requested. Update the documentation to match the new build setup. |
||
---|---|---|
.. | ||
ui/small-white | ||
.gitignore | ||
Makefile | ||
README.txt | ||
talk.rst |
I gave this talk on 2013-May-10 at the GitMerge conference in Berlin on "User Day". (I gave another, more technical talk on a whiteboard the day before at "Developer Day".) To convert it into HTML, run "make html" in this directory. -- Michael Haggerty