[PATCH] Escape asciidoc's built-in em-dash replacement
[git.git] / git-merge-fredrik.py
2005-09-11 Junio C HamanoAdd a new merge strategy by Fredrik Kuivinen.