diff options
| author | Junio C Hamano <gitster@pobox.com> | 2011-02-15 10:47:04 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-15 10:47:04 -0800 |
| commit | 4e363b11bdc3770efcfe55dac79f6dc18a5e562b (patch) | |
| tree | 26a0d3b8e23a1f763bb15090e4c98b8ed5073456 /Documentation/git-difftool.txt | |
| parent | 3952710bfaa46917fd0c3a9b29d076ec013d6b6a (diff) | |
| download | git-4e363b11bdc3770efcfe55dac79f6dc18a5e562b.tar.gz | |
Revert "unpack_trees(): skip trees that are the same in all input"
This reverts commit 83c90314aa27ae3768c04375d02e4f3fb12b726d, which
seems to have broken merge to report conflicts when there should be
none.
Diffstat (limited to 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions