diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2007-07-12 14:50:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2007-07-12 14:50:57 -0700 |
| commit | f8db7884286232274c8e7c7d82a35a2478b097d3 (patch) | |
| tree | 833095a0568837f16f32d525ddee83e464eb6044 /builtin-merge-file.c | |
| parent | gitweb: new cgi parameter: opt (diff) | |
| parent | gitk: Improve handling of -- and ambiguous arguments (diff) | |
| download | tgif-f8db7884286232274c8e7c7d82a35a2478b097d3.tar.xz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk
* 'master' of git://git.kernel.org/pub/scm/gitk/gitk:
gitk: Improve handling of -- and ambiguous arguments
gitk: Use git log and add support for --left-right
gitk: Fix bug causing "can't read commitrow(0,n)" error
[PATCH] gitk: Fix for tree view ending in nested directories
gitk: Remove the unused stopfindproc function
gitk: Fix bug in the anc_or_desc routine
gitk: Fix the find and highlight functions
Diffstat (limited to 'builtin-merge-file.c')
0 files changed, 0 insertions, 0 deletions