summaryrefslogtreecommitdiff
path: root/git-gui/lib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-07-15 06:48:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-07-15 06:56:27 (GMT)
commitebcffb1d44643bab69671abdf79209489e64dbef (patch)
treed451abfc0dad9e9f3c45eb3cdc247d1dc3f81710 /git-gui/lib
parent1864265c4d9afa374b27836ff0a3b3eb40144552 (diff)
parent0af0ac7ebbbd2afbc4399d5658e193460b4caaa3 (diff)
downloadgit-ebcffb1d44643bab69671abdf79209489e64dbef.zip
git-ebcffb1d44643bab69671abdf79209489e64dbef.tar.gz
git-ebcffb1d44643bab69671abdf79209489e64dbef.tar.bz2
Merge branch 'js/merge-rr'
* js/merge-rr: Move MERGE_RR from .git/rr-cache/ into .git/ Conflicts: builtin-rerere.c
Diffstat (limited to 'git-gui/lib')
0 files changed, 0 insertions, 0 deletions