xdiff: PATIENCE/HISTOGRAM are not independent option bits
[gitweb.git] / contrib / examples / git-merge.sh
2008-07-17 Merge branch 'maint'
2008-07-16 Merge branch 'mv/merge-in-c'
2008-07-08 Build in merge