git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: eac5a40)
git-merge documentation: describe how conflict is presented
authorJunio C Hamano <redacted>
Mon, 1 Sep 2008 03:36:32 +0000 (20:36 -0700)
committerJunio C Hamano <redacted>
Mon, 1 Sep 2008 03:36:32 +0000 (20:36 -0700)
commit70a3f89733a4cd21631690ba980598fea2249067
treeed316383e68e4d5ea33af03fe5977606d03151a7tree | snapshot
parenteac5a401512181cd315a1031af2b8a25430e335acommit | 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 <redacted>
Documentation/git-merge.txt diff | blob | history
git clone https://git.99rst.org/PROJECT