Three-way merge: fix silly bug that made trivial merges not work
[git] / t / diff-lib.sh
2005-05-31  Junio C Hamano[PATCH] diff: consolidate test helper script pieces.