Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint'
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
1
2
git-gui.sh
patch
|
diff1
|
diff2
|
blob
|
history
raw
|
combined
(merge:
b01d432
fb25092
)
diff --cc
git-gui.sh
Simple merge