]> rtime.felk.cvut.cz Git - sojka/git-gui.git/commitdiff
projects / sojka / git-gui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b01d432 fb25092)
Merge branch 'maint'
authorShawn O. Pearce <spearce@spearce.org>
Wed, 8 Apr 2009 14:41:13 +0000 (07:41 -0700)
committerShawn 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

1  2 
git-gui.sh patch | diff1 | diff2 | blob | history

diff --cc git-gui.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.