diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2009-04-08 07:41:13 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2009-04-08 07:41:13 -0700 |
| commit | 4339d5109c847fc938cd8405001ffde4d230c09f (patch) | |
| tree | e55511718d7d17fb939e398f3cdd17c0e25fa9df /git-gui/lib/commit.tcl | |
| parent | b01d4326040ec6b9d98baba32091c9458fc809d4 (diff) | |
| parent | fb25092a88ba889f540beaf9acdb208421ce2a20 (diff) | |
| download | git-4339d5109c847fc938cd8405001ffde4d230c09f.tar.gz | |
Merge branch 'maint'
* maint:
git-gui: Ensure consistent usage of mergetool.keepBackup
git-gui: fix use of undeclared variable diff_empty_count
Diffstat (limited to 'git-gui/lib/commit.tcl')
0 files changed, 0 insertions, 0 deletions