summaryrefslogtreecommitdiff
path: root/notes-merge.h
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2011-08-11 23:19:47 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-14 14:19:33 -0700
commitf1a0f457b3d3cf3b4acea2addc1e26e7b931d474 (patch)
treeb6249d8e65e0450fd53b5b4b1d74f2a4c3c8bd84 /notes-merge.h
parentt6022: Remove unnecessary untracked files to make test cleaner (diff)
downloadtgif-f1a0f457b3d3cf3b4acea2addc1e26e7b931d474.tar.xz
t6022: New tests checking for unnecessary updates of files
This testcase was part of en/merge-recursive that was reverted in 6db4105 (Revert "Merge branch 'en/merge-recursive'" 2011-05-19). While the other changes in that series caused unfortunate breakage, this testcase is still useful; reinstate it. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-merge.h')
0 files changed, 0 insertions, 0 deletions