diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2012-05-10 14:08:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-07-09 14:40:03 -0700 |
| commit | 78fb67f31edbdcde3580f9abc1048f4630ef1bee (patch) | |
| tree | 432a434874a03202c3e1c0ae089741b5be205809 /vcs-svn/trp.txt | |
| parent | apply: allow rerere() to work on --3way results (diff) | |
| download | tgif-78fb67f31edbdcde3580f9abc1048f4630ef1bee.tar.xz | |
apply: document --3way option
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'vcs-svn/trp.txt')
0 files changed, 0 insertions, 0 deletions