Code

Make sure we error out if we can't remove a file on automatic merges.
[git.git] / diffcore-order.c
2005-05-31 Junio C Hamano[PATCH] Add -O<orderfile> option to diff-* brothers.