diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-20 11:54:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-20 11:54:37 -0700 |
| commit | d4f6bc887de7957645b998a0b0e22bc4048f36dd (patch) | |
| tree | ba00486ba16b88fd86a5e29eb710f9276fa40439 /builtin-merge-file.c | |
| parent | da4e4a65a27ca912c3f48289acf9ff7a67476c3f (diff) | |
| parent | a41ddbb649c72214a4861827eedc7b2eebe0608f (diff) | |
| download | git-d4f6bc887de7957645b998a0b0e22bc4048f36dd.tar.gz git-d4f6bc887de7957645b998a0b0e22bc4048f36dd.tar.xz | |
Merge git://git.kernel.org/pub/scm/gitk/gitk
* git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Allow diff view without context lines
gitk: Add another string to translation
gitk: Add option 'Simple history' to the options menu
gitk: Handle msysGit version during version comparisons
gitk: Make more options easily accessible from Edit View dialog
gitk: Check git version before using --textconv flag
gitk: Use --textconv to generate diff text
gitk: Update German translation.
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions