summaryrefslogtreecommitdiff
path: root/tools/git-applymbox
diff options
context:
space:
mode:
authorLibravatar Paul Mackerras <paulus@dorrigo.(none)>2005-07-31 21:35:21 +1000
committerLibravatar Paul Mackerras <paulus@dorrigo.(none)>2005-07-31 21:35:21 +1000
commit1115fb38df53d1151eba3142f8acb9672ea2c9c4 (patch)
tree76d3b4ff34b3e8d33d0294a5e0b750252d51a996 /tools/git-applymbox
parentImprove the merge display when the result differs from all parents. (diff)
downloadtgif-1115fb38df53d1151eba3142f8acb9672ea2c9c4.tar.xz
Fix some bugs causing application error popups.
Specifically this should fix the following errors: wrong # args: should be "startdiff ids" (fix from Junio Hamano) can't read "filelines(....)": no such element in array can't unset "treepending": no such variable
Diffstat (limited to 'tools/git-applymbox')
0 files changed, 0 insertions, 0 deletions