l10n: zh.CN.po: update by msgmerge git.pot
[gitweb.git] / mergetools / kompare
2012-05-14 Merge branch 'ef/checkout-empty' into maint
2012-05-14 Merge branch 'jk/maint-tformat-with-z' into maint
2012-05-11 Merge branch 'ef/checkout-empty'
2012-05-11 Merge branch 'ah/maint-grep-double-init' into maint
2012-05-11 Merge branch 'fa/maint-config-doc' into maint
2012-05-10 Merge branch 'fa/maint-config-doc'
2012-05-10 Merge branch 'ah/maint-grep-double-init'
2012-05-08 Merge branch 'rs/maint-dir-strbuf' into rs/dir-strbuf
2012-05-07 Merge branch 'jk/maint-tformat-with-z'
2012-05-07 Merge branch 'jk/maint-gitweb-test-use-sane-perl' into...
2012-05-07 Merge branch 'ef/maint-1.7.6-clone-progress-fix' into...
2012-05-02 Merge branch 'jk/maint-gitweb-test-use-sane-perl'
2012-04-26 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-26 Merge branch 'jk/add-p-skip-conflicts' into maint
2012-04-20 Merge branch 'jb/am-include'
2012-04-16 Merge branch 'jk/add-p-skip-conflicts'
2012-04-16 Merge branch 'rs/combine-diff-zero-context-at-the-begin...
2012-04-10 Add 'contrib/subtree/' from commit 'd3a04e06c77d57978bb...
2012-04-09 Merge branch 'cb/maint-t5541-make-server-port-portable...
2012-04-02 Merge branch 'pt/gitk'
2012-03-26 Merge branch 'jn/maint-fast-import-empty-ls' into maint
2012-03-24 Merge gitk changes from Paul Mackerras at git://ozlabs...
2012-03-16 Merge "two fixes for fast-import's 'ls' command" from...
2012-03-16 Merge branch 'th/doc-diff-submodule-option'
2012-03-12 Merge branch 'jc/maint-diff-patch-header' into maint
2012-03-12 Merge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-08 Merge branch 'jn/maint-do-not-match-with-unsanitized...
2012-03-06 Merge branch 'jc/maint-diff-patch-header'
2012-03-05 Merge branch 'jn/maint-gitweb-invalid-regexp' into...
2012-03-05 Merge branch 'sp/smart-http-failure-to-push' into maint
2012-03-01 Merge branch 'jn/maint-gitweb-invalid-regexp'
2012-02-27 Merge branch 'pj/remote-set-branches-usage-fix' into...
2012-02-27 Merge branch 'sp/smart-http-failure-to-push'
2012-02-23 Merge branch 'pj/remote-set-branches-usage-fix'
2012-02-21 Merge branch 'cb/maint-t5541-make-server-port-portable...
2012-02-20 Merge branch 'cb/maint-t5541-make-server-port-portable'
2012-02-16 Merge branch 'jc/checkout-out-of-unborn' into maint
2012-02-16 Merge branch 'jc/maint-mailmap-output' into maint
2012-02-16 Merge branch 'jc/maint-commit-ignore-i-t-a' into maint
2012-02-16 Merge branch 'mm/empty-loose-error-message' into maint
2012-02-14 Merge branch 'jk/maint-tag-show-fixes' into maint
2012-02-13 Merge branch 'js/add-e-submodule-fix' into maint
2012-02-13 Merge branch 'jc/checkout-out-of-unborn'
2012-02-13 Merge branch 'jc/maint-mailmap-output'
2012-02-13 Merge branch 'jc/maint-commit-ignore-i-t-a'
2012-02-13 Merge branch 'jk/maint-tag-show-fixes'
2012-02-13 Merge branch 'mm/empty-loose-error-message'
2012-02-10 Merge branch 'js/add-e-submodule-fix'
2012-02-06 Merge branch 'sp/smart-http-failure-to-push' into maint
2012-02-06 Merge branch 'jc/maint-log-first-parent-pathspec' into...
2012-02-06 Sync with 1.7.6.6
2012-01-29 Merge branch 'rs/diff-postimage-in-context'
2012-01-29 Merge branch 'sp/smart-http-failure-to-push'
2012-01-29 Merge branch 'jc/maint-log-first-parent-pathspec'
2012-01-29 Merge branch 'tr/maint-mailinfo'
2012-01-27 Merge branch 'svn-fe' of git://repo.or.cz/git/jrn into...
2012-01-18 Merge branch 'mh/maint-show-ref-doc'
2012-01-18 Merge branch 'tr/maint-word-diff-incomplete-line'
2012-01-13 Merge branch 'tr/maint-mailinfo'
2012-01-13 Merge branch 'maint-1.7.6' into maint-1.7.7
2012-01-12 Merge branch 'maint-1.7.6' into maint-1.7.7
2012-01-10 Merge the attributes fix in from maint-1.6.6 branch
2012-01-09 Merge branch 'mm/maint-gitweb-project-maxdepth'
2012-01-06 Merge branch 'maint-1.7.6' into maint-1.7.7
2012-01-04 Merge branch 'nd/maint-parse-depth' into maint
2012-01-03 Merge branch 'maint-1.7.6' into maint-1.7.7
2011-12-28 Merge branch 'jv/maint-config-set' into maint
2011-12-28 Merge branch 'jc/checkout-m-twoway' into maint
2011-12-28 Merge branch 'tr/doc-sh-setup' into maint
2011-12-28 Merge branch 'jk/maint-strbuf-missing-init' into maint
2011-12-28 Merge branch 'jk/maint-push-v-is-verbose' into maint
2011-12-28 Merge branch 'jk/maint-snprintf-va-copy' into maint
2011-12-28 Merge branch 'jk/maint-mv' into maint
2011-12-28 Merge branch 'ew/keepalive' into maint
2011-12-28 Merge branch 'na/strtoimax' into maint
2011-12-22 Merge branch 'tr/doc-sh-setup'
2011-12-22 Merge branch 'tr/pty-all'
2011-12-22 Merge branch 'jk/maint-strbuf-missing-init'
2011-12-22 Merge branch 'jk/maint-push-v-is-verbose'
2011-12-22 Merge branch 'jn/test-cleanup-7006'
2011-12-21 Merge branch 'jl/submodule-status-failure-report' into...
2011-12-21 Merge branch 'tr/userdiff-c-returns-pointer' into maint
2011-12-21 Merge branch 'ms/commit-cc-option-helpstring' into...
2011-12-20 Merge branch 'jc/checkout-m-twoway'
2011-12-20 Merge branch 'ew/keepalive'
2011-12-20 Merge branch 'jc/checkout-m-twoway'
2011-12-20 Merge branch 'jk/maint-snprintf-va-copy'
2011-12-20 Merge branch 'jk/maint-mv'
2011-12-17 Merge git://ozlabs.org/~paulus/gitk
2011-12-14 Merge branch 'jl/submodule-status-failure-report'
2011-12-14 Merge branch 'tr/userdiff-c-returns-pointer'
2011-12-14 Merge branch 'jc/maint-pack-object-cycle' into maint
2011-12-14 Merge branch 'mf/curl-select-fdset' into maint
2011-12-14 Merge branch 'nd/maint-ignore-exclude' into maint-1.7.7
2011-12-14 Merge branch 'maint-1.7.6' into maint-1.7.7
2011-12-14 Merge branch 'master' of git://repo.or.cz/git-gui
2011-12-09 Merge branch 'ab/pull-rebase-config'
2011-12-05 Merge branch 'nd/maint-ignore-exclude'
2011-12-05 Merge branch 'jc/maint-pack-object-cycle'
2011-12-05 Merge branch 'na/strtoimax'
next