summaryrefslogtreecommitdiff
path: root/builtin-apply.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2008-07-15 00:08:02 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2008-07-15 00:08:02 -0700
commit547905f8cd2a04b3e1117f00025b60f81aa60f47 (patch)
tree9e9421e597a9caecc6f16c3afd6a1b77abacabb9 /builtin-apply.c
parentMerge branch 'js/merge-rr' (diff)
parentgit-gui: MERGE_RR lives in .git/ directly with newer Git versions (diff)
downloadtgif-547905f8cd2a04b3e1117f00025b60f81aa60f47.tar.xz
Merge git://repo.or.cz/git-gui
* git://repo.or.cz/git-gui: git-gui: MERGE_RR lives in .git/ directly with newer Git versions git-gui: Exit shortcut in MacOSX repaired
Diffstat (limited to 'builtin-apply.c')
0 files changed, 0 insertions, 0 deletions