summaryrefslogtreecommitdiff
path: root/t/t4100/t-apply-9.patch
diff options
context:
space:
mode:
authorLibravatar John Keeping <john@keeping.me.uk>2013-04-07 22:07:51 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-04-08 10:50:52 -0700
commitaacecc3b36a6cd4d2707e3f1cbd7bb4122477c64 (patch)
tree077c3536de6dc869f8de4f6e1bacd0d8bbef9990 /t/t4100/t-apply-9.patch
parentmerge-tree: fix typo in merge-tree.c::unresolved (diff)
downloadtgif-aacecc3b36a6cd4d2707e3f1cbd7bb4122477c64.tar.xz
merge-tree: don't print entries that match "local"
The documentation says: the output from the command omits entries that match the <branch1> tree. But currently "added in branch1" and "removed in branch1" (both while unchanged in branch2) do print output. Change this so that the behaviour matches the documentation. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4100/t-apply-9.patch')
0 files changed, 0 insertions, 0 deletions