aboutsummaryrefslogtreecommitdiffstats
path: root/git-remote-testgit.py
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-09-15 12:39:12 -0700
committerJunio C Hamano <gitster@pobox.com>2010-09-15 12:39:12 -0700
commit9f0ccb5b0ac067b3408d3776bb06f85acd4a1e7e (patch)
tree6e3056f75553bb79e27b0364f83aca2e906d672c /git-remote-testgit.py
parentMerge git://repo.or.cz/git-gui (diff)
parentRE: [PATCH] Avoid rename/add conflict when contents are identical (diff)
downloadgit-9f0ccb5b0ac067b3408d3776bb06f85acd4a1e7e.tar.gz
git-9f0ccb5b0ac067b3408d3776bb06f85acd4a1e7e.zip
Merge branch 'ks/recursive-rename-add-identical'
* ks/recursive-rename-add-identical: RE: [PATCH] Avoid rename/add conflict when contents are identical
Diffstat (limited to 'git-remote-testgit.py')
0 files changed, 0 insertions, 0 deletions