diff options
| author |  Elijah Newren <newren@gmail.com> | 2019-04-05 08:00:24 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2019-04-08 16:02:08 +0900 |
| commit | 6d169fd321c0da4b20c13d08bbe19d55cab12e11 (patch) | |
| tree | 2f98c72329ce0ee2f4526cdb8f2b8ec27ffaedbb /git-mergetool--lib.sh | |
| parent | t6043: fix copied test description to match its purpose (diff) | |
| download | tgif-6d169fd321c0da4b20c13d08bbe19d55cab12e11.tar.xz | |
merge-recursive: track information associated with directory renames
Directory rename detection previously silently applied. In order to
allow printing information about paths that changed or printing a
conflict notification (and only doing so near other potential conflict
messages associated with the paths), save this information inside the
rename struct for later use. A subsequent patch will make use of the
additional information.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions