Three-way merge: fix silly bug that made trivial merges not work
[git] / Documentation / diffcore.txt
2005-06-05  Junio C Hamano[PATCH] Documentation: describe diff tweaking.