| commit | 4339d5109c847fc938cd8405001ffde4d230c09f | |
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Wed, 8 Apr 2009 14:41:13 +0000 (8 07:41 -0700) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Wed, 8 Apr 2009 14:41:13 +0000 (8 07:41 -0700) | ||
| tree | e55511718d7d17fb939e398f3cdd17c0e25fa9df | treesnapshot (tar.gz zip) |
| parent | b01d4326040ec6b9d98baba32091c9458fc809d4 | commitdiff |
| parent | fb25092a88ba889f540beaf9acdb208421ce2a20 | commitdiff |
Merge branch 'maint'
* maint:
git-gui: Ensure consistent usage of mergetool.keepBackup
git-gui: fix use of undeclared variable diff_empty_count
* maint:
git-gui: Ensure consistent usage of mergetool.keepBackup
git-gui: fix use of undeclared variable diff_empty_count
| git-gui.sh | diff1 | diff2 | blobhistory |