summaryrefslogtreecommitdiff
path: root/fmt-merge-msg.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-24 23:10:37 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-03-24 23:10:37 (GMT)
commit92e625d3a3a94b9765baf4d54b1fd86117656d30 (patch)
treeb144934baba40907743ded2c33f46d3c196e7e34 /fmt-merge-msg.h
parentf53fc38c083da1a1d14f54713ffd8fd0965a2194 (diff)
parentc846920f23704ece225cc5b6c7566777fb561502 (diff)
downloadgit-92e625d3a3a94b9765baf4d54b1fd86117656d30.zip
git-92e625d3a3a94b9765baf4d54b1fd86117656d30.tar.gz
git-92e625d3a3a94b9765baf4d54b1fd86117656d30.tar.bz2
Merge branch 'master' of git://ozlabs.org/~paulus/gitk
* 'master' of git://ozlabs.org/~paulus/gitk: gitk: Update .po files gitk: l10n: Add Catalan translation gitk: Fix typo in Russian translation gitk: Remove tcl-format flag from a message that shouldn't have it gitk: Pass --invert-grep option down to "git log" gitk: Synchronize config file writes gitk: Report errors in saving config file gitk: Only write changed configuration variables gitk: Enable mouse horizontal scrolling in diff pane gitk: Default wrcomcmd to use --pretty=email
Diffstat (limited to 'fmt-merge-msg.h')
0 files changed, 0 insertions, 0 deletions