summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2007-08-19 11:38:15 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2007-08-19 11:38:15 -0700
commit63f328290a0edda617c0881a356c07280fbba459 (patch)
treee641651dfe5a9eedcf4ad9968f7ebac7585651a5 /Documentation/git-merge-index.txt
parentMerge branch 'master' of git://git.kernel.org/pub/scm/gitk/gitk (diff)
parentgit-gui: Added support for OS X right click (diff)
downloadtgif-63f328290a0edda617c0881a356c07280fbba459.tar.xz
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui: git-gui: Added support for OS X right click git-gui: Avoid Tcl error in popup menu on diff viewer
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions