summaryrefslogtreecommitdiff
path: root/git-merge-recursive.py
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2005-09-26 10:22:43 +1000
committerPaul Mackerras <paulus@samba.org>2005-09-26 10:22:43 +1000
commita69875318bf5f7a493ecb77c63073ee18f8ad557 (patch)
tree542c72e99adc41e744188fd120c017dbca6ffb9c /git-merge-recursive.py
parent6e2dda35c2f012298f4f4759db2d651ef18e39a0 (diff)
downloadgit-a69875318bf5f7a493ecb77c63073ee18f8ad557.tar.gz
Change wish8.4 back to wish
Checking in the change from wish to wish8.4 was a mistake; I had changed it for a test but forgot to change it back before checking in a patch.
Diffstat (limited to 'git-merge-recursive.py')
0 files changed, 0 insertions, 0 deletions