![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Shawn O. Pearce <spearce@spearce.org> | |
| Wed, 8 Apr 2009 14:41:13 +0000 (07:41 -0700) | ||
| committer | Shawn O. Pearce <spearce@spearce.org> | |
| Wed, 8 Apr 2009 14:41:13 +0000 (07:41 -0700) |
* maint:
git-gui: Ensure consistent usage of mergetool.keepBackup
git-gui: fix use of undeclared variable diff_empty_count
git-gui: Ensure consistent usage of mergetool.keepBackup
git-gui: fix use of undeclared variable diff_empty_count
| 1 | 2 | |||
|---|---|---|---|---|
| git-gui.sh | patch | | diff1 | | diff2 | | blob | history |
diff --cc git-gui.sh
Simple merge