git-merge documentation: describe how conflict is presented
[gitweb.git] / Documentation / RelNotes-1.5.6.5.txt
2008-08-17 Merge git-gui 0.11.0
2008-08-17 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-07 Merge branch 'lt/config-fsync' into maint
2008-08-07 Merge branch 'jc/reflog-expire' into maint
2008-08-07 Merge branch 'ag/rewrite_one' into maint
2008-08-06 Sync with 1.5.6.5
2008-08-06 GIT 1.5.6.5 v1.5.6.5
2008-08-06 Merge git://repo.or.cz/git-gui
2008-08-06 Merge git://git.kernel.org/pub/scm/gitk/gitk
2008-08-06 Merge branch 'rs/archive-parse-options'
2008-08-06 Merge branch 'maint'
2008-08-06 RelNotes 1.5.6.5 updates
2008-08-02 Merge branch 'maint'
2008-08-02 Start 1.5.6.5 RelNotes to describe accumulated fixes