![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Sep 2008 03:36:32 +0000 (20:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 1 Sep 2008 03:36:32 +0000 (20:36 -0700) | ||
| commit | 70a3f89733a4cd21631690ba980598fea2249067 | |
| tree | ed316383e68e4d5ea33af03fe5977606d03151a7 | tree | snapshot |
| parent | eac5a401512181cd315a1031af2b8a25430e335a | commit | diff |
git-merge documentation: describe how conflict is presented
We took it granted that everybody knows how to read the RCS merge style
conflicts, and did not give illustrations in the documentation. Now we
are introducing an alternative output style, it is time to document this.
The lack of illustration has been bugging me for a long time.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
We took it granted that everybody knows how to read the RCS merge style
conflicts, and did not give illustrations in the documentation. Now we
are introducing an alternative output style, it is time to document this.
The lack of illustration has been bugging me for a long time.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| Documentation/git-merge.txt | diff | blob | history |