diff options
| author | Sebastian Thiel <byronimo@gmail.com> | 2010-06-28 19:16:23 +0200 |
|---|---|---|
| committer | Sebastian Thiel <byronimo@gmail.com> | 2010-06-28 19:16:23 +0200 |
| commit | 8d2239f24f6a54d98201413d4f46256df0d6a5f3 (patch) | |
| tree | cd3685e0bd87441eab4888efbc4e14a232a65a7b /test/fixtures/diff_new_mode | |
| parent | 58fb1187b7b8f1e62d3930bdba9be5aba47a52c6 (diff) | |
| parent | 1fe889ea0cb2547584075dc1eb77f52c54b9a8c4 (diff) | |
| download | GitPython-8d2239f24f6a54d98201413d4f46256df0d6a5f3.tar.gz GitPython-8d2239f24f6a54d98201413d4f46256df0d6a5f3.zip | |
Merge branch 'sha20'
Diffstat (limited to 'test/fixtures/diff_new_mode')
| -rw-r--r-- | test/fixtures/diff_new_mode | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/fixtures/diff_new_mode b/test/fixtures/diff_new_mode index 663c9099..29705386 100644 --- a/test/fixtures/diff_new_mode +++ b/test/fixtures/diff_new_mode @@ -1,7 +1,7 @@ diff --git a/conf/global_settings.py b/conf/global_settings.py old mode 100644 new mode 100755 -index 9ec1bac..1c4f83b +index 9ec1bac000000000000000000000000000000000..1c4f83b000000000000000000000000000000000 --- a/conf/global_settings.py +++ b/conf/global_settings.py @@ -58,6 +58,7 @@ TEMPLATE_CONTEXT_PROCESSORS = ( |