diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-03-08 12:11:00 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-06 15:52:22 -0700 |
| commit | 1be1e85115244a3a11f89b75c798823a7dce795f (patch) | |
| tree | 881379c837cd22bcba4ef7b4de6aa81fe78f8661 /userdiff.h | |
| parent | rerere: do use multiple variants (diff) | |
| download | tgif-1be1e85115244a3a11f89b75c798823a7dce795f.tar.xz | |
rerere: gc and clear
Adjust "git rerere gc" and "git rerere clear" to the new world order
with rerere database with multiple variants for the same shape of
conflicts.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'userdiff.h')
0 files changed, 0 insertions, 0 deletions