Junio C Hamano 4209752da5 user-manual: describe how higher stages are set during a merge
Higher stages store the blobs involved from their side verbatim.  Removal
of uninteresting hunks are done by "diff --cc" upon demand and not stored
in the index.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-12 14:30:51 -07:00
..
2007-08-10 11:32:42 -07:00
2007-06-07 00:04:01 -07:00
2007-07-24 00:47:05 -07:00
2008-04-22 21:53:37 -07:00
2008-06-09 16:13:08 -07:00
2008-06-11 16:21:56 -07:00
2008-06-06 11:18:28 -07:00
2007-06-07 00:04:01 -07:00
2007-06-07 00:04:01 -07:00
2007-06-07 00:04:01 -07:00
2007-06-07 00:04:01 -07:00
2007-06-02 16:02:49 -07:00
2007-06-16 01:13:35 -07:00
2007-07-02 00:35:58 -07:00
2007-07-12 12:01:47 -07:00
2007-08-15 15:01:20 -07:00
2007-09-19 03:11:28 -07:00
2008-01-29 22:00:34 -08:00
2007-10-03 02:33:48 -07:00
2007-11-18 14:00:38 -08:00
2007-12-01 11:20:00 -08:00
2008-01-07 22:41:43 -08:00
2008-02-17 00:20:38 -08:00
2008-02-17 00:20:38 -08:00
2008-02-23 11:31:04 -08:00
2008-03-08 19:43:21 -08:00
2008-03-27 20:36:35 -07:00
2008-02-01 19:10:10 -08:00
2008-04-20 11:36:53 -07:00
2008-05-25 21:11:24 -07:00
2008-05-27 22:32:47 -07:00
2008-06-07 11:45:48 -07:00
2008-04-07 21:57:43 -07:00
2008-06-11 22:18:09 -07:00