summaryrefslogtreecommitdiff
path: root/git-resolve-script
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-06 03:28:33 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-06-06 03:28:33 (GMT)
commit76f38347b4199f65e8c897ebf4f9ce1d3a24378b (patch)
tree463e3f8a4ee1f7700ec81caf636d9ec3106e6fc1 /git-resolve-script
parent02ede67ad45973f9f8d07db7896a537de97d21b6 (diff)
downloadgit-76f38347b4199f65e8c897ebf4f9ce1d3a24378b.zip
git-76f38347b4199f65e8c897ebf4f9ce1d3a24378b.tar.gz
git-76f38347b4199f65e8c897ebf4f9ce1d3a24378b.tar.bz2
git-read-tree: fix up three-way merge tests
When we collapse three entries, we need to check all of the collapsed entries against the old pre-merge state.
Diffstat (limited to 'git-resolve-script')
0 files changed, 0 insertions, 0 deletions