diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-08-31 14:16:39 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-31 14:28:20 -0700 |
| commit | a2c2cef0cd5210aa870e1d226d348a7ddd0277ff (patch) | |
| tree | 50f31daaa6c410faec8a6cb2777e7e783afeecf6 /builtin/merge-ours.c | |
| parent | Merge branch 'maint' (diff) | |
| download | tgif-a2c2cef0cd5210aa870e1d226d348a7ddd0277ff.tar.xz | |
gitdiffcore doc: update pickaxe description
The old text described the original design (one side does not have it at
all while the other side has it); this was later amended to check if the
number of occurrences changed, which is what we currently do with -S.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-ours.c')
0 files changed, 0 insertions, 0 deletions