Files
git/Documentation
John Keeping 4db4f0fba4 git-merge(1): document diff-algorithm option to merge-recursive
Commit 07924d4 (diff: Introduce --diff-algorithm command line option
2013-01-16) added diff-algorithm as a parameter to the recursive merge
strategy but did not document it.  Do so.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-04-05 10:57:23 -07:00
..
2011-08-08 09:30:12 -07:00
2009-04-06 00:27:09 -07:00
2012-09-18 21:49:46 -07:00
2012-04-20 15:49:16 -07:00
2012-07-09 14:40:03 -07:00
2012-09-25 10:39:52 -07:00
2012-09-18 21:49:50 -07:00
2012-06-19 11:35:19 -07:00
2011-12-12 11:52:31 -08:00
2011-09-06 11:42:12 -07:00
2011-05-19 10:55:54 -07:00
2012-11-14 13:49:53 -08:00
2011-03-11 10:59:16 -05:00
2013-01-10 13:47:20 -08:00
2010-07-05 13:39:02 -07:00
2012-06-19 11:35:19 -07:00