diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-10 13:56:49 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-09 14:40:03 -0700 |
| commit | f2633ebd766b7f5817ae0ec69060170bb9b1501f (patch) | |
| tree | c3139aeef3df05f44d0b1039c5e66e35f25ddf27 /.gitattributes | |
| parent | apply: register conflicted stages to the index (diff) | |
| download | tgif-f2633ebd766b7f5817ae0ec69060170bb9b1501f.tar.xz | |
apply: allow rerere() to work on --3way results
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions