summaryrefslogtreecommitdiff
path: root/git-gui/git-gui.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-11-05 17:36:49 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-11-05 17:36:49 (GMT)
commit31731b0ea4fccf5455ce367d483feaabdc411e0a (patch)
tree02b100f4b59557e9b2eb0f1392de697e812c3aa1 /git-gui/git-gui.sh
parente806c43537e2e9b5ab96d03b777a5759ef57b13d (diff)
parentaf77aee9cac51c2036e6019b4aebec2049f03e6b (diff)
downloadgit-31731b0ea4fccf5455ce367d483feaabdc411e0a.zip
git-31731b0ea4fccf5455ce367d483feaabdc411e0a.tar.gz
git-31731b0ea4fccf5455ce367d483feaabdc411e0a.tar.bz2
Merge branch 'maint'
* maint: Fix a formatting error in git-merge.txt
Diffstat (limited to 'git-gui/git-gui.sh')
0 files changed, 0 insertions, 0 deletions