diff options
| author | Petr Baudis <pasky@ucw.cz> | 2005-06-08 21:26:55 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-08 22:54:45 (GMT) |
| commit | 8544a6f1b8e7340924c406d717ac37becd2f6046 (patch) | |
| tree | c5a0b446a265a28ebfccee6a874fad2386678d2b /test-date.c | |
| parent | 7f1d1129628c63f46aebe03afacdb2ab259ef2d6 (diff) | |
| download | git-8544a6f1b8e7340924c406d717ac37becd2f6046.zip git-8544a6f1b8e7340924c406d717ac37becd2f6046.tar.gz git-8544a6f1b8e7340924c406d717ac37becd2f6046.tar.bz2 | |
[PATCH] Fix git-merge-one-file permissions auto-merging
In the automerge case, permissions were not restored properly after the
merge tool was invoked and overwrote the target file.
Signed-off-by: Petr Baudis <pasky@ucw.cz>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'test-date.c')
0 files changed, 0 insertions, 0 deletions