diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-08-24 14:29:37 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-08-24 14:29:37 -0700 |
| commit | 97e5f4908dd22c99e825ccb254f05a61fda8d19c (patch) | |
| tree | 72d9d7d5d33393551b0d68df71b254863be5e42f /git-gui/lib/commit.tcl | |
| parent | ab54cd6c4d54b7d9bf6dccfa7ea54f209ea76601 (diff) | |
| parent | 446247db78a733f44d2470afb1f1983d28058159 (diff) | |
| download | git-97e5f4908dd22c99e825ccb254f05a61fda8d19c.tar.gz | |
Merge branch 'mv/maint-merge-fix' into maint
* mv/maint-merge-fix:
merge: fix numerus bugs around "trivial merge" area
Diffstat (limited to 'git-gui/lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions