Merge branch 'da/maint-mergetool-twoway' into maint

diff --git a/git-gui/lib/git-gui.ico b/git-gui/lib/git-gui.ico
index 563dd66238c1a5c169438fdb87ab797f6d19d1bc..334cfa5a1a59c320e86789ccf4ed3320584a0215 100644 (file)
Binary files a/git-gui/lib/git-gui.ico and b/git-gui/lib/git-gui.ico differ