diff options
| author |  Clemens Buchacher <drizzd@aon.at> | 2012-04-15 01:15:17 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2012-04-15 22:44:39 -0700 |
| commit | 30fd3a54256a54e5a6006a203c923e97641fb2c2 (patch) | |
| tree | b294e986c72d687d1d326bc2658e6e938f251434 /gpg-interface.c | |
| parent | Kick off post 1.7.10 cycle (diff) | |
| download | tgif-30fd3a54256a54e5a6006a203c923e97641fb2c2.tar.xz | |
merge overwrites unstaged changes in renamed file
Signed-off-by: Clemens Buchacher <drizzd@aon.at>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'gpg-interface.c')
0 files changed, 0 insertions, 0 deletions