diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-24 07:53:25 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-24 07:53:25 -0700 |
| commit | d3a486c47d920efc183645766d762fd697c42088 (patch) | |
| tree | 80af05c5f216f71733bd824a4b0696519e28b9ac /Documentation/git-merge-index.txt | |
| parent | Merge branch 'es/line-log-further-fixes' into tr/line-log (diff) | |
| download | tgif-d3a486c47d920efc183645766d762fd697c42088.tar.xz | |
t4211: fix incorrect rebase at f8395edc (range-set: satisfy non-empty ranges invariant)
Wnen I rewrote "cat b.c | wc -l" into "wc -l <b.c" to squash in a
suggestion on the list to this series, I screwed up subsequent
rebase. Fix it up.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions