git-merge documentation: describe how conflict is presented
[gitweb.git] / Documentation / RelNotes-1.5.5.4.txt
2008-08-17 Merge git-gui 0.11.0
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-06 Merge git://repo.or.cz/git-gui
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-07-30 Merge git://repo.or.cz/git-gui
2008-07-27 Merge git://repo.or.cz/git-gui
2008-07-15 Merge git://repo.or.cz/git-gui
2008-07-08 Merge branch 'jc/blame' (early part) into HEAD
2008-07-07 Merge branch 'dr/ceiling'
2008-07-06 Merge git://repo.or.cz/git-gui
2008-06-27 Merge branch 'maint-1.5.4' into maint-1.5.5
2008-06-22 Merge branch 'mo/status-untracked'
2008-06-22 Merge branch 'kh/update-ref'
2008-06-11 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-06-07 Merge 1.5.5.4 in
2008-06-07 GIT 1.5.5.4 v1.5.5.4