i18n: advice: internationalize message for conflicts
[gitweb.git] / mergetools / examdiff
2016-04-13 Merge branch 'mg/complete-cherry-mark-to-log'
2016-04-13 Merge branch 'ep/trace-doc-sample-fix'
2016-04-13 Merge branch 'jc/makefile-redirection-stderr'
2016-04-13 Merge branch 'lt/pretty-expand-tabs'
2016-04-13 Merge branch 'mj/pull-rebase-autostash'
2016-04-13 Merge branch 'jn/mergetools-examdiff'
2016-04-04 mergetools: add support for ExamDiff