merge-recursive: Provide more info in conflict markers with file renames
[gitweb.git] / git-gui / Makefile
2007-02-12 Merge git-gui